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.35 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.50 by pcg, Sun Feb 22 08:09:37 2004 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
32 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
53 54
54/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
55 56
56/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
57void 58void
58rxvt_term::lookup_key (XKeyEvent *ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
59{ 60{
60 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
61 unsigned int newlen; 62 unsigned int newlen;
62 KeySym keysym; 63 KeySym keysym;
63#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
65#endif 66#endif
66 int valid_keysym; 67 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
68 69
69/* 70 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
72 * 73 *
73 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
74 */ 75 */
75 shft = (ev->state & ShiftMask); 76 shft = (ev.state & ShiftMask);
76 ctrl = (ev->state & ControlMask); 77 ctrl = (ev.state & ControlMask);
77 meta = (ev->state & ModMetaMask); 78 meta = (ev.state & ModMetaMask);
78 79
79 if (numlock_state || (ev->state & ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
80 { 81 {
81 numlock_state = (ev->state & ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 84 }
84 85
85 kbuf[0] = 0; 86 kbuf[0] = 0;
86 87
87#ifdef USE_XIM 88#ifdef USE_XIM
88 if (Input_Context) 89 if (Input_Context)
89 { 90 {
90 Status status_return; 91 Status status_return;
91 92
92#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
96 else 97 else
97#endif 98#endif
98 { 99 {
99 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
100 101
101 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
102 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
103 if (rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
104 SET_LOCALE (rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
105 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
106 len = XwcLookupString (Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
107 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
108 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
109 SET_LOCALE (locale); 110 SET_LOCALE (locale);
110 111
111 if (status_return == XLookupChars 112 if (status_return == XLookupChars
112 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
113 { 114 {
114 wkbuf[len] = 0; 115 wkbuf[len] = 0;
115 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
116 if (len < 0) 117 if (len < 0)
117 len = 0; 118 len = 0;
118 } 119 }
119 else 120 else
120 len = 0; 121 len = 0;
121 } 122 }
122 123
123 valid_keysym = status_return == XLookupKeySym 124 valid_keysym = status_return == XLookupKeySym
124 || status_return == XLookupBoth; 125 || status_return == XLookupBoth;
125 } 126 }
126 else 127 else
127#endif 128#endif
128 { 129 {
129 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 130 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
130 valid_keysym = !len; 131 valid_keysym = keysym != NoSymbol;
131 } 132 }
132 133
133 if (valid_keysym) 134 if (valid_keysym)
134 { 135 {
135/* for some backwards compatibility */ 136 /* for some backwards compatibility */
136#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
137# ifdef HOTKEY_CTRL 138# ifdef HOTKEY_CTRL
138 if (ctrl) 139 if (ctrl)
139# else 140# else
140 if (meta) 141 if (meta)
141# endif 142# endif
142 { 143 {
143 if (keysym == ks_bigfont) 144 if (keysym == ks_bigfont)
144 { 145 {
145 change_font (0, FONT_UP); 146 change_font (0, FONT_UP);
146 return; 147 return;
147 } 148 }
148 else if (keysym == ks_smallfont) 149 else if (keysym == ks_smallfont)
149 { 150 {
150 change_font (0, FONT_DN); 151 change_font (0, FONT_DN);
151 return; 152 return;
153 }
152 } 154 }
153 }
154#endif 155#endif
155 156
156 if (TermWin.saveLines) { 157 if (TermWin.saveLines)
158 {
157#ifdef UNSHIFTED_SCROLLKEYS 159#ifdef UNSHIFTED_SCROLLKEYS
158 if (!ctrl && !meta) { 160 if (!ctrl && !meta)
161 {
159#else 162#else
160 if (IS_SCROLL_MOD) { 163 if (IS_SCROLL_MOD)
164 {
161#endif 165#endif
162 int lnsppg; 166 int lnsppg;
163 167
164#ifdef PAGING_CONTEXT_LINES 168#ifdef PAGING_CONTEXT_LINES
165 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
166#else 170#else
167 lnsppg = TermWin.nrow * 4 / 5; 171 lnsppg = TermWin.nrow * 4 / 5;
168#endif 172#endif
169 if (keysym == XK_Prior) { 173 if (keysym == XK_Prior)
174 {
170 scr_page (UP, lnsppg); 175 scr_page (UP, lnsppg);
171 return; 176 return;
177 }
172 } else if (keysym == XK_Next) { 178 else if (keysym == XK_Next)
179 {
173 scr_page (DN, lnsppg); 180 scr_page (DN, lnsppg);
174 return; 181 return;
175 } 182 }
176 } 183 }
177#ifdef SCROLL_ON_UPDOWN_KEYS 184#ifdef SCROLL_ON_UPDOWN_KEYS
178 if (IS_SCROLL_MOD) { 185 if (IS_SCROLL_MOD)
179 if (keysym == XK_Up) { 186 {
180 scr_page (UP, 1); 187 if (keysym == XK_Up)
181 return; 188 {
189 scr_page (UP, 1);
190 return;
191 }
182 } else if (keysym == XK_Down) { 192 else if (keysym == XK_Down)
183 scr_page (DN, 1); 193 {
184 return; 194 scr_page (DN, 1);
185 } 195 return;
186 } 196 }
197 }
187#endif 198#endif
188#ifdef SCROLL_ON_HOMEEND_KEYS 199#ifdef SCROLL_ON_HOMEEND_KEYS
189 if (IS_SCROLL_MOD) { 200 if (IS_SCROLL_MOD)
190 if (keysym == XK_Home) { 201 {
191 scr_move_to (0, 1); 202 if (keysym == XK_Home)
192 return; 203 {
204 scr_move_to (0, 1);
205 return;
206 }
193 } else if (keysym == XK_End) { 207 else if (keysym == XK_End)
194 scr_move_to (1, 0); 208 {
195 return; 209 scr_move_to (1, 0);
196 } 210 return;
197 } 211 }
212 }
198#endif 213#endif
199 } 214 }
200 215
201 if (shft) { 216 if (shft)
217 {
202 /* Shift + F1 - F10 generates F11 - F20 */ 218 /* Shift + F1 - F10 generates F11 - F20 */
203 if (keysym >= XK_F1 && keysym <= XK_F10) { 219 if (keysym >= XK_F1 && keysym <= XK_F10)
220 {
204 keysym += (XK_F11 - XK_F1); 221 keysym += (XK_F11 - XK_F1);
205 shft = 0; /* turn off Shift */ 222 shft = 0; /* turn off Shift */
223 }
206 } else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) { 224 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
207 switch (keysym) { 225 {
208 /* normal XTerm key bindings */ 226 switch (keysym)
227 {
228 /* normal XTerm key bindings */
209 case XK_Insert: /* Shift+Insert = paste mouse selection */ 229 case XK_Insert: /* Shift+Insert = paste mouse selection */
210 selection_request (ev->time, 0, 0); 230 selection_request (ev.time, 0, 0);
211 return; 231 return;
212 /* rxvt extras */ 232 /* rxvt extras */
213 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 233 case XK_KP_Add: /* Shift+KP_Add = bigger font */
214 change_font (0, FONT_UP); 234 change_font (0, FONT_UP);
215 return; 235 return;
216 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
217 change_font (0, FONT_DN); 237 change_font (0, FONT_DN);
218 return; 238 return;
219 } 239 }
220 } 240 }
221 } 241 }
222#ifdef PRINTPIPE 242#ifdef PRINTPIPE
223 if (keysym == XK_Print) { 243 if (keysym == XK_Print)
244 {
224 scr_printscreen (ctrl | shft); 245 scr_printscreen (ctrl | shft);
225 return; 246 return;
226 } 247 }
227#endif 248#endif
228#ifdef GREEK_SUPPORT
229 if (keysym == ks_greekmodeswith) {
230 greek_mode = !greek_mode;
231 if (greek_mode) {
232 xterm_seq (XTerm_title,
233 (greek_getmode() == GREEK_ELOT928
234 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
235 greek_reset();
236 } else
237 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
238 return;
239 }
240#endif
241 249
242 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 250 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
251 {
243#ifdef KEYSYM_RESOURCE 252#ifdef KEYSYM_RESOURCE
244 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) { 253 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
245 unsigned int l; 254 {
255 unsigned int l;
246 const unsigned char *kbuf0; 256 const unsigned char *kbuf0;
247 const unsigned char ch = C0_ESC; 257 const unsigned char ch = C0_ESC;
248 258
249 kbuf0 = (Keysym_map[keysym & 0xFF]); 259 kbuf0 = (Keysym_map[keysym & 0xFF]);
250 l = (unsigned int)*kbuf0++; 260 l = (unsigned int)*kbuf0++;
251 261
252 /* escape prefix */ 262 /* escape prefix */
253 if (meta) 263 if (meta)
254# ifdef META8_OPTION 264# ifdef META8_OPTION
255 if (meta_char == C0_ESC) 265 if (meta_char == C0_ESC)
256# endif 266# endif
257 tt_write (&ch, 1); 267 tt_write (&ch, 1);
258 tt_write (kbuf0, l); 268 tt_write (kbuf0, l);
259 return; 269 return;
260 } else 270 }
271 else
261#endif 272#endif
262 { 273 {
263 newlen = 1; 274 newlen = 1;
264 switch (keysym) { 275 switch (keysym)
276 {
265#ifndef NO_BACKSPACE_KEY 277#ifndef NO_BACKSPACE_KEY
266 case XK_BackSpace: 278 case XK_BackSpace:
267 if (PrivateModes & PrivMode_HaveBackSpace) { 279 if (PrivateModes & PrivMode_HaveBackSpace)
280 {
268 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 281 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
269 ^ !!ctrl) ? '\b' : '\177'; 282 ^ !!ctrl) ? '\b' : '\177';
270 kbuf[1] = '\0'; 283 kbuf[1] = '\0';
271 } else 284 }
272 STRCPY(kbuf, key_backspace); 285 else
286 STRCPY (kbuf, key_backspace);
273# ifdef MULTICHAR_SET 287# ifdef MULTICHAR_SET
274 if ((Options & Opt_mc_hack) && screen.cur.col > 0) { 288 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
275 int col, row; 289 {
290 int col, row;
276 291
277 newlen = STRLEN(kbuf); 292 newlen = STRLEN (kbuf);
278 col = screen.cur.col - 1; 293 col = screen.cur.col - 1;
279 row = screen.cur.row + TermWin.saveLines; 294 row = screen.cur.row + TermWin.saveLines;
280 if (IS_MULTI2(screen.rend[row][col])) 295 if (IS_MULTI2 (screen.rend[row][col]))
281 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 296 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
282 } 297 }
283# endif 298# endif
284 break; 299 break;
285#endif 300#endif
286#ifndef NO_DELETE_KEY 301#ifndef NO_DELETE_KEY
287 case XK_Delete: 302 case XK_Delete:
288 STRCPY(kbuf, key_delete); 303 STRCPY (kbuf, key_delete);
289# ifdef MULTICHAR_SET 304# ifdef MULTICHAR_SET
290 if (Options & Opt_mc_hack) { 305 if (Options & Opt_mc_hack)
291 int col, row; 306 {
292 307 int col, row;
293 newlen = STRLEN(kbuf); 308
294 col = screen.cur.col; 309 newlen = STRLEN (kbuf);
310 col = screen.cur.col;
295 row = screen.cur.row + TermWin.saveLines; 311 row = screen.cur.row + TermWin.saveLines;
296 if (IS_MULTI1(screen.rend[row][col])) 312 if (IS_MULTI1 (screen.rend[row][col]))
297 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 313 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
298 } 314 }
299# endif 315# endif
300 break; 316 break;
301#endif 317#endif
302 case XK_Tab: 318 case XK_Tab:
303 if (shft) 319 if (shft)
304 STRCPY(kbuf, "\033[Z"); 320 STRCPY (kbuf, "\033[Z");
305 else { 321 else
322 {
306#ifdef CTRL_TAB_MAKES_META 323#ifdef CTRL_TAB_MAKES_META
307 if (ctrl) 324 if (ctrl)
308 meta = 1; 325 meta = 1;
309#endif 326#endif
310#ifdef MOD4_TAB_MAKES_META 327#ifdef MOD4_TAB_MAKES_META
311 if (ev->state & Mod4Mask) 328 if (ev.state & Mod4Mask)
312 meta = 1; 329 meta = 1;
313#endif 330#endif
314 newlen = 0; 331 newlen = 0;
315 } 332 }
316 break; 333 break;
317
318 334
319#ifdef XK_KP_Left 335#ifdef XK_KP_Left
320 case XK_KP_Up: /* \033Ox or standard */ 336 case XK_KP_Up: /* \033Ox or standard */
321 case XK_KP_Down: /* \033Or or standard */ 337 case XK_KP_Down: /* \033Or or standard */
322 case XK_KP_Right: /* \033Ov or standard */ 338 case XK_KP_Right: /* \033Ov or standard */
323 case XK_KP_Left: /* \033Ot or standard */ 339 case XK_KP_Left: /* \033Ot or standard */
324 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 340 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
325 STRCPY(kbuf, "\033OZ"); 341 {
326 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 342 STRCPY (kbuf, "\033OZ");
327 break; 343 kbuf[2] = "txvr"[keysym - XK_KP_Left];
328 } else 344 break;
345 }
346 else
329 /* translate to std. cursor key */ 347 /* translate to std. cursor key */
330 keysym = XK_Left + (keysym - XK_KP_Left); 348 keysym = XK_Left + (keysym - XK_KP_Left);
331 /* FALLTHROUGH */ 349 /* FALLTHROUGH */
332#endif 350#endif
333 case XK_Up: /* "\033[A" */ 351 case XK_Up: /* "\033[A" */
334 case XK_Down: /* "\033[B" */ 352 case XK_Down: /* "\033[B" */
335 case XK_Right: /* "\033[C" */ 353 case XK_Right: /* "\033[C" */
336 case XK_Left: /* "\033[D" */ 354 case XK_Left: /* "\033[D" */
337 STRCPY(kbuf, "\033[Z"); 355 STRCPY (kbuf, "\033[Z");
338 kbuf[2] = ("DACB"[keysym - XK_Left]); 356 kbuf[2] = "DACB"[keysym - XK_Left];
339 /* do Shift first */ 357 /* do Shift first */
340 if (shft) 358 if (shft)
341 kbuf[2] = ("dacb"[keysym - XK_Left]); 359 kbuf[2] = "dacb"[keysym - XK_Left];
342 else if (ctrl) { 360 else if (ctrl)
343 kbuf[1] = 'O'; 361 {
344 kbuf[2] = ("dacb"[keysym - XK_Left]); 362 kbuf[1] = 'O';
363 kbuf[2] = "dacb"[keysym - XK_Left];
364 }
345 } else if (PrivateModes & PrivMode_aplCUR) 365 else if (PrivateModes & PrivMode_aplCUR)
346 kbuf[1] = 'O'; 366 kbuf[1] = 'O';
347#ifdef MULTICHAR_SET 367#ifdef MULTICHAR_SET
348 //TODO: ?? 368 //TODO: ??
349 if (Options & Opt_mc_hack) { 369 if (Options & Opt_mc_hack)
350 int col, row, m; 370 {
371 int col, row, m;
351 372
352 col = screen.cur.col; 373 col = screen.cur.col;
353 row = screen.cur.row + TermWin.saveLines; 374 row = screen.cur.row + TermWin.saveLines;
354 m = 0; 375 m = 0;
355 if (keysym == XK_Right 376 if (keysym == XK_Right
356 && IS_MULTI1(screen.rend[row][col])) 377 && IS_MULTI1 (screen.rend[row][col]))
357 m = 1; 378 m = 1;
358 else if (keysym == XK_Left) { 379 else if (keysym == XK_Left)
359 if (col > 0) { 380 {
360 if (IS_MULTI2(screen.rend[row][col - 1])) 381 if (col > 0)
361 m = 1; 382 {
362 } else if (screen.cur.row > 0) { 383 if (IS_MULTI2 (screen.rend[row][col - 1]))
363 col = screen.tlen[--row]; 384 m = 1;
364 if (col == -1) 385 }
365 col = TermWin.ncol - 1; 386 else if (screen.cur.row > 0)
366 else 387 {
367 col--; 388 col = screen.tlen[--row];
368 if (col > 0 389 if (col == -1)
369 && IS_MULTI2(screen.rend[row][col])) 390 col = TermWin.ncol - 1;
370 m = 1; 391 else
371 } 392 col--;
372 } 393 if (col > 0
373 if (m) 394 && IS_MULTI2 (screen.rend[row][col]))
374 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 395 m = 1;
375 } 396 }
397 }
398 if (m)
399 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
400 }
376#endif 401#endif
377 break; 402 break;
378 403
379#ifndef UNSHIFTED_SCROLLKEYS 404#ifndef UNSHIFTED_SCROLLKEYS
380# ifdef XK_KP_Prior 405# ifdef XK_KP_Prior
381 case XK_KP_Prior: 406 case XK_KP_Prior:
382 /* allow shift to override */ 407 /* allow shift to override */
383 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 408 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
384 STRCPY(kbuf, "\033Oy"); 409 {
385 break; 410 STRCPY (kbuf, "\033Oy");
386 } 411 break;
387 /* FALLTHROUGH */ 412 }
413 /* FALLTHROUGH */
388# endif 414# endif
389 case XK_Prior: 415 case XK_Prior:
390 STRCPY(kbuf, "\033[5~"); 416 STRCPY (kbuf, "\033[5~");
391 break; 417 break;
392# ifdef XK_KP_Next 418# ifdef XK_KP_Next
393 case XK_KP_Next: 419 case XK_KP_Next:
394 /* allow shift to override */ 420 /* allow shift to override */
395 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 421 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
396 STRCPY(kbuf, "\033Os"); 422 {
397 break; 423 STRCPY (kbuf, "\033Os");
398 } 424 break;
399 /* FALLTHROUGH */ 425 }
426 /* FALLTHROUGH */
400# endif 427# endif
401 case XK_Next: 428 case XK_Next:
402 STRCPY(kbuf, "\033[6~"); 429 STRCPY (kbuf, "\033[6~");
403 break; 430 break;
404#endif 431#endif
405 case XK_KP_Enter: 432 case XK_KP_Enter:
406 /* allow shift to override */ 433 /* allow shift to override */
407 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 434 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
408 STRCPY(kbuf, "\033OM"); 435 {
409 } else { 436 STRCPY (kbuf, "\033OM");
410 kbuf[0] = '\r'; 437 }
411 kbuf[1] = '\0'; 438 else
412 } 439 {
413 break; 440 kbuf[0] = '\r';
441 kbuf[1] = '\0';
442 }
443 break;
414 444
415#ifdef XK_KP_Begin 445#ifdef XK_KP_Begin
416 case XK_KP_Begin: 446 case XK_KP_Begin:
417 STRCPY(kbuf, "\033Ou"); 447 STRCPY (kbuf, "\033Ou");
418 break; 448 break;
419 449
420 case XK_KP_Insert: 450 case XK_KP_Insert:
421 STRCPY(kbuf, "\033Op"); 451 STRCPY (kbuf, "\033Op");
422 break; 452 break;
423 453
424 case XK_KP_Delete: 454 case XK_KP_Delete:
425 STRCPY(kbuf, "\033On"); 455 STRCPY (kbuf, "\033On");
426 break; 456 break;
427#endif 457#endif
428 case XK_KP_F1: /* "\033OP" */ 458 case XK_KP_F1: /* "\033OP" */
429 case XK_KP_F2: /* "\033OQ" */ 459 case XK_KP_F2: /* "\033OQ" */
430 case XK_KP_F3: /* "\033OR" */ 460 case XK_KP_F3: /* "\033OR" */
431 case XK_KP_F4: /* "\033OS" */ 461 case XK_KP_F4: /* "\033OS" */
432 STRCPY(kbuf, "\033OP"); 462 STRCPY (kbuf, "\033OP");
433 kbuf[2] += (keysym - XK_KP_F1); 463 kbuf[2] += (keysym - XK_KP_F1);
434 break; 464 break;
435 465
436 case XK_KP_Multiply: /* "\033Oj" : "*" */ 466 case XK_KP_Multiply: /* "\033Oj" : "*" */
437 case XK_KP_Add: /* "\033Ok" : "+" */ 467 case XK_KP_Add: /* "\033Ok" : "+" */
438 case XK_KP_Separator: /* "\033Ol" : "," */ 468 case XK_KP_Separator: /* "\033Ol" : "," */
439 case XK_KP_Subtract: /* "\033Om" : "-" */ 469 case XK_KP_Subtract: /* "\033Om" : "-" */
440 case XK_KP_Decimal: /* "\033On" : "." */ 470 case XK_KP_Decimal: /* "\033On" : "." */
441 case XK_KP_Divide: /* "\033Oo" : "/" */ 471 case XK_KP_Divide: /* "\033Oo" : "/" */
442 case XK_KP_0: /* "\033Op" : "0" */ 472 case XK_KP_0: /* "\033Op" : "0" */
443 case XK_KP_1: /* "\033Oq" : "1" */ 473 case XK_KP_1: /* "\033Oq" : "1" */
444 case XK_KP_2: /* "\033Or" : "2" */ 474 case XK_KP_2: /* "\033Or" : "2" */
445 case XK_KP_3: /* "\033Os" : "3" */ 475 case XK_KP_3: /* "\033Os" : "3" */
446 case XK_KP_4: /* "\033Ot" : "4" */ 476 case XK_KP_4: /* "\033Ot" : "4" */
447 case XK_KP_5: /* "\033Ou" : "5" */ 477 case XK_KP_5: /* "\033Ou" : "5" */
448 case XK_KP_6: /* "\033Ov" : "6" */ 478 case XK_KP_6: /* "\033Ov" : "6" */
449 case XK_KP_7: /* "\033Ow" : "7" */ 479 case XK_KP_7: /* "\033Ow" : "7" */
450 case XK_KP_8: /* "\033Ox" : "8" */ 480 case XK_KP_8: /* "\033Ox" : "8" */
451 case XK_KP_9: /* "\033Oy" : "9" */ 481 case XK_KP_9: /* "\033Oy" : "9" */
452 /* allow shift to override */ 482 /* allow shift to override */
453 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 483 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
454 STRCPY(kbuf, "\033Oj"); 484 {
455 kbuf[2] += (keysym - XK_KP_Multiply); 485 STRCPY (kbuf, "\033Oj");
456 } else { 486 kbuf[2] += (keysym - XK_KP_Multiply);
487 }
488 else
489 {
457 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 490 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
458 kbuf[1] = '\0'; 491 kbuf[1] = '\0';
459 } 492 }
460 break; 493 break;
461 494
462 case XK_Find: 495 case XK_Find:
463 STRCPY(kbuf, "\033[1~"); 496 STRCPY (kbuf, "\033[1~");
464 break; 497 break;
465 case XK_Insert: 498 case XK_Insert:
466 STRCPY(kbuf, "\033[2~"); 499 STRCPY (kbuf, "\033[2~");
467 break; 500 break;
468#ifdef DXK_Remove /* support for DEC remove like key */ 501#ifdef DXK_Remove /* support for DEC remove like key */
469 case DXK_Remove: 502 case DXK_Remove:
470 /* FALLTHROUGH */ 503 /* FALLTHROUGH */
471#endif 504#endif
472 case XK_Execute: 505 case XK_Execute:
473 STRCPY(kbuf, "\033[3~"); 506 STRCPY (kbuf, "\033[3~");
474 break; 507 break;
475 case XK_Select: 508 case XK_Select:
476 STRCPY(kbuf, "\033[4~"); 509 STRCPY (kbuf, "\033[4~");
477 break; 510 break;
478#ifdef XK_KP_End 511#ifdef XK_KP_End
479 case XK_KP_End: 512 case XK_KP_End:
480 /* allow shift to override */ 513 /* allow shift to override */
481 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 514 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
482 STRCPY(kbuf, "\033Oq"); 515 {
483 break; 516 STRCPY (kbuf, "\033Oq");
484 } 517 break;
485 /* FALLTHROUGH */ 518 }
519 /* FALLTHROUGH */
486#endif 520#endif
487 case XK_End: 521 case XK_End:
488 STRCPY(kbuf, KS_END); 522 STRCPY (kbuf, KS_END);
489 break; 523 break;
490#ifdef XK_KP_Home 524#ifdef XK_KP_Home
491 case XK_KP_Home: 525 case XK_KP_Home:
492 /* allow shift to override */ 526 /* allow shift to override */
493 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 527 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
494 STRCPY(kbuf, "\033Ow"); 528 {
495 break; 529 STRCPY (kbuf, "\033Ow");
496 } 530 break;
497 /* FALLTHROUGH */ 531 }
532 /* FALLTHROUGH */
498#endif 533#endif
499 case XK_Home: 534 case XK_Home:
500 STRCPY(kbuf, KS_HOME); 535 STRCPY (kbuf, KS_HOME);
501 break; 536 break;
502 537
503#define FKEY(n, fkey) \ 538#define FKEY(n, fkey) \
504 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 539 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
505 540
506 case XK_F1: /* "\033[11~" */ 541 case XK_F1: /* "\033[11~" */
507 case XK_F2: /* "\033[12~" */ 542 case XK_F2: /* "\033[12~" */
508 case XK_F3: /* "\033[13~" */ 543 case XK_F3: /* "\033[13~" */
509 case XK_F4: /* "\033[14~" */ 544 case XK_F4: /* "\033[14~" */
510 case XK_F5: /* "\033[15~" */ 545 case XK_F5: /* "\033[15~" */
511 FKEY(11, XK_F1); 546 FKEY (11, XK_F1);
512 break; 547 break;
513 case XK_F6: /* "\033[17~" */ 548 case XK_F6: /* "\033[17~" */
514 case XK_F7: /* "\033[18~" */ 549 case XK_F7: /* "\033[18~" */
515 case XK_F8: /* "\033[19~" */ 550 case XK_F8: /* "\033[19~" */
516 case XK_F9: /* "\033[20~" */ 551 case XK_F9: /* "\033[20~" */
517 case XK_F10: /* "\033[21~" */ 552 case XK_F10: /* "\033[21~" */
518 FKEY(17, XK_F6); 553 FKEY (17, XK_F6);
519 break; 554 break;
520 case XK_F11: /* "\033[23~" */ 555 case XK_F11: /* "\033[23~" */
521 case XK_F12: /* "\033[24~" */ 556 case XK_F12: /* "\033[24~" */
522 case XK_F13: /* "\033[25~" */ 557 case XK_F13: /* "\033[25~" */
523 case XK_F14: /* "\033[26~" */ 558 case XK_F14: /* "\033[26~" */
524 FKEY(23, XK_F11); 559 FKEY (23, XK_F11);
525 break; 560 break;
526 case XK_F15: /* "\033[28~" */ 561 case XK_F15: /* "\033[28~" */
527 case XK_F16: /* "\033[29~" */ 562 case XK_F16: /* "\033[29~" */
528 FKEY(28, XK_F15); 563 FKEY (28, XK_F15);
529 break; 564 break;
530 case XK_Help: /* "\033[28~" */ 565 case XK_Help: /* "\033[28~" */
531 FKEY(28, XK_Help); 566 FKEY (28, XK_Help);
532 break; 567 break;
533 case XK_Menu: /* "\033[29~" */ 568 case XK_Menu: /* "\033[29~" */
534 FKEY(29, XK_Menu); 569 FKEY (29, XK_Menu);
535 break; 570 break;
536 case XK_F17: /* "\033[31~" */ 571 case XK_F17: /* "\033[31~" */
537 case XK_F18: /* "\033[32~" */ 572 case XK_F18: /* "\033[32~" */
538 case XK_F19: /* "\033[33~" */ 573 case XK_F19: /* "\033[33~" */
539 case XK_F20: /* "\033[34~" */ 574 case XK_F20: /* "\033[34~" */
540 case XK_F21: /* "\033[35~" */ 575 case XK_F21: /* "\033[35~" */
541 case XK_F22: /* "\033[36~" */ 576 case XK_F22: /* "\033[36~" */
542 case XK_F23: /* "\033[37~" */ 577 case XK_F23: /* "\033[37~" */
543 case XK_F24: /* "\033[38~" */ 578 case XK_F24: /* "\033[38~" */
544 case XK_F25: /* "\033[39~" */ 579 case XK_F25: /* "\033[39~" */
545 case XK_F26: /* "\033[40~" */ 580 case XK_F26: /* "\033[40~" */
546 case XK_F27: /* "\033[41~" */ 581 case XK_F27: /* "\033[41~" */
547 case XK_F28: /* "\033[42~" */ 582 case XK_F28: /* "\033[42~" */
548 case XK_F29: /* "\033[43~" */ 583 case XK_F29: /* "\033[43~" */
549 case XK_F30: /* "\033[44~" */ 584 case XK_F30: /* "\033[44~" */
550 case XK_F31: /* "\033[45~" */ 585 case XK_F31: /* "\033[45~" */
551 case XK_F32: /* "\033[46~" */ 586 case XK_F32: /* "\033[46~" */
552 case XK_F33: /* "\033[47~" */ 587 case XK_F33: /* "\033[47~" */
553 case XK_F34: /* "\033[48~" */ 588 case XK_F34: /* "\033[48~" */
554 case XK_F35: /* "\033[49~" */ 589 case XK_F35: /* "\033[49~" */
555 FKEY(31, XK_F17); 590 FKEY (31, XK_F17);
556 break; 591 break;
557#undef FKEY 592#undef FKEY
558 default: 593 default:
559 newlen = 0; 594 newlen = 0;
560 break; 595 break;
561 } 596 }
562 if (newlen) 597 if (newlen)
563 len = STRLEN(kbuf); 598 len = STRLEN (kbuf);
564 } 599 }
565 /* 600 /*
566 * Pass meta for all function keys, if 'meta' option set 601 * Pass meta for all function keys, if 'meta' option set
567 */ 602 */
568#ifdef META8_OPTION 603#ifdef META8_OPTION
569 if (meta && (meta_char == 0x80) && len > 0) 604 if (meta && (meta_char == 0x80) && len > 0)
570 kbuf[len - 1] |= 0x80; 605 kbuf[len - 1] |= 0x80;
571#endif 606#endif
607
608 }
572 } else if (ctrl && keysym == XK_minus) { 609 else if (ctrl && keysym == XK_minus)
610 {
573 len = 1; 611 len = 1;
574 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 612 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
575 } else { 613 }
614 else
615 {
576#ifdef META8_OPTION 616#ifdef META8_OPTION
577 /* set 8-bit on */ 617 /* set 8-bit on */
578 if (meta && (meta_char == 0x80)) { 618 if (meta && (meta_char == 0x80))
579 unsigned char *ch; 619 {
620 unsigned char *ch;
580 621
581 for (ch = kbuf; ch < kbuf + len; ch++) 622 for (ch = kbuf; ch < kbuf + len; ch++)
582 *ch |= 0x80; 623 *ch |= 0x80;
583 meta = 0; 624 meta = 0;
625 }
626#endif
627 /* nil */ ;
628 }
584 } 629 }
585#endif 630
586#ifdef GREEK_SUPPORT 631 if (len <= 0)
587 if (greek_mode) 632 return; /* not mapped */
588 len = greek_xlat(kbuf, len); 633
589#endif 634 if (Options & Opt_scrollTtyKeypress)
590 /* nil */ ; 635 if (TermWin.view_start)
591 } 636 {
637 TermWin.view_start = 0;
638 want_refresh = 1;
592 } 639 }
593 640
594 if (len <= 0) 641 /*
595 return; /* not mapped */
596
597 if (Options & Opt_scrollTtyKeypress)
598 if (TermWin.view_start) {
599 TermWin.view_start = 0;
600 want_refresh = 1;
601 }
602
603/*
604 * these modifications only affect the static keybuffer 642 * these modifications only affect the static keybuffer
605 * pass Shift/Control indicators for function keys ending with `~' 643 * pass Shift/Control indicators for function keys ending with `~'
606 * 644 *
607 * eg, 645 * eg,
608 * Prior = "ESC[5~" 646 * Prior = "ESC[5~"
609 * Shift+Prior = "ESC[5$" 647 * Shift+Prior = "ESC[5$"
610 * Ctrl+Prior = "ESC[5^" 648 * Ctrl+Prior = "ESC[5^"
611 * Ctrl+Shift+Prior = "ESC[5@" 649 * Ctrl+Shift+Prior = "ESC[5@"
612 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 650 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
613 */ 651 */
614 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 652 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
615 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 653 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
616 654
617/* escape prefix */ 655 /* escape prefix */
618 if (meta 656 if (meta
619#ifdef META8_OPTION 657#ifdef META8_OPTION
620 && (meta_char == C0_ESC) 658 && (meta_char == C0_ESC)
621#endif 659#endif
622 ) { 660 )
661 {
623 const unsigned char ch = C0_ESC; 662 const unsigned char ch = C0_ESC;
624 663
625 tt_write(&ch, 1); 664 tt_write (&ch, 1);
626 } 665 }
627#ifdef DEBUG_CMD 666#ifdef DEBUG_CMD
667 if (debug_key)
628 if (debug_key) { /* Display keyboard buffer contents */ 668 { /* Display keyboard buffer contents */
629 char *p; 669 char *p;
630 int i; 670 int i;
631 671
632 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 672 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
633 for (i = 0, p = kbuf; i < len; i++, p++) 673 for (i = 0, p = kbuf; i < len; i++, p++)
634 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 674 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
635 fprintf(stderr, "'\n"); 675 fprintf (stderr, "'\n");
636 } 676 }
637#endif /* DEBUG_CMD */ 677#endif /* DEBUG_CMD */
638 tt_write (kbuf, (unsigned int)len); 678 tt_write (kbuf, (unsigned int)len);
639} 679}
640/*}}} */ 680/*}}} */
641 681
642#if (MENUBAR_MAX) 682#if (MENUBAR_MAX)
643/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 683/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
644/* attempt to `write' count to the input buffer */ 684/* attempt to `write' count to the input buffer */
645unsigned int 685unsigned int
646rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 686rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
647{ 687{
648 unsigned int n, s; 688 unsigned int n, s;
649 689
650 n = cmdbuf_ptr - cmdbuf_base; 690 n = cmdbuf_ptr - cmdbuf_base;
651 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 691 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
652 if (n > 0 && s < count) { 692 if (n > 0 && s < count)
693 {
653 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 694 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
654 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 695 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
655 cmdbuf_ptr = cmdbuf_base; 696 cmdbuf_ptr = cmdbuf_base;
656 cmdbuf_endp -= n; 697 cmdbuf_endp -= n;
657 s += n; 698 s += n;
658 } 699 }
659 if (count > s) { 700 if (count > s)
701 {
660 rxvt_print_error("data loss: cmd_write too large"); 702 rxvt_print_error ("data loss: cmd_write too large");
661 count = s; 703 count = s;
662 } 704 }
663 for (; count--;) 705 for (; count--;)
664 *cmdbuf_endp++ = *str++; 706 *cmdbuf_endp++ = *str++;
665 return 0; 707 return 0;
666} 708}
667#endif /* MENUBAR_MAX */ 709#endif /* MENUBAR_MAX */
668 710
669void 711void
670rxvt_term::flush () 712rxvt_term::flush ()
… …
684 scr_refresh (refresh_type); 726 scr_refresh (refresh_type);
685 scrollbar_show (1); 727 scrollbar_show (1);
686#ifdef USE_XIM 728#ifdef USE_XIM
687 IMSendSpot (); 729 IMSendSpot ();
688#endif 730#endif
689 }
690 731
691 XFlush (Xdisplay); 732 }
733
734 display->flush ();
692} 735}
693 736
694void 737void
695rxvt_term::check_cb (check_watcher &w) 738rxvt_term::check_cb (check_watcher &w)
696{ 739{
697 SET_R (this); 740 SET_R (this);
698 SET_LOCALE (locale); 741 SET_LOCALE (locale);
699 742
700 flush (); 743 flush ();
701}
702
703void
704rxvt_term::process_x_events ()
705{
706 do
707 {
708 XEvent xev;
709
710 XNextEvent (Xdisplay, &xev);
711
712#if defined(CURSOR_BLINK)
713 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
714 {
715 if (hidden_cursor)
716 {
717 hidden_cursor = 0;
718 want_refresh = 1;
719 }
720
721 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
722 }
723#endif
724
725#if defined(POINTER_BLANK)
726 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
727 {
728 if (xev.type == MotionNotify
729 || xev.type == ButtonPress
730 || xev.type == ButtonRelease)
731 if (hidden_pointer)
732 pointer_unblank ();
733
734 if (xev.type == KeyPress && hidden_pointer == 0)
735 pointer_blank ();
736 }
737#endif
738
739#ifdef USE_XIM
740 if (!XFilterEvent (&xev, xev.xany.window))
741#endif
742 process_x_event (&xev);
743 }
744 while (XPending (Xdisplay));
745} 744}
746 745
747#ifdef CURSOR_BLINK 746#ifdef CURSOR_BLINK
748void 747void
749rxvt_term::cursor_blink_cb (time_watcher &w) 748rxvt_term::cursor_blink_cb (time_watcher &w)
… …
766 w.start (w.at + TEXT_BLINK_INTERVAL); 765 w.start (w.at + TEXT_BLINK_INTERVAL);
767 } 766 }
768} 767}
769#endif 768#endif
770 769
771void
772rxvt_term::x_cb (io_watcher &w, short revents)
773{
774 SET_R (this);
775 SET_LOCALE (locale);
776
777 process_x_events ();
778}
779
780bool 770bool
781rxvt_term::pty_fill () 771rxvt_term::pty_fill ()
782{ 772{
783 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 773 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
784 774
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 775 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 776 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 777 cmdbuf_endp = cmdbuf_ptr + n;
788 778
789 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 779 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
790 780
791 if (n > 0) 781 if (n > 0)
792 { 782 {
793 cmdbuf_endp += n; 783 cmdbuf_endp += n;
… …
855 if (ch == '\n') 845 if (ch == '\n')
856 { 846 {
857 nlines++; 847 nlines++;
858 refresh_count++; 848 refresh_count++;
859 849
860 if (!(Options & Opt_jumpScroll) 850 if (! (Options & Opt_jumpScroll)
861 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 851 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
862 { 852 {
863 refreshnow = true; 853 refreshnow = true;
864 flag = false; 854 flag = false;
865 ch = NOCHAR; 855 ch = NOCHAR;
866 break; 856 break;
857 }
858
859 // scr_add_lines only works for nlines < TermWin.nrow - 1.
860 if (nlines >= TermWin.nrow - 1)
861 {
862 scr_add_lines (buf, nlines, str - buf);
863 nlines = 0;
864 str = buf;
867 } 865 }
868 } 866 }
869 867
870 if (str >= buf + BUFSIZ) 868 if (str >= buf + BUFSIZ)
871 { 869 {
… …
903 process_nonprinting (ch); 901 process_nonprinting (ch);
904 break; 902 break;
905 case C0_ESC: /* escape char */ 903 case C0_ESC: /* escape char */
906 process_escape_seq (); 904 process_escape_seq ();
907 break; 905 break;
908 /*case 0x9b: */ /* CSI */ 906 /*case 0x9b: */ /* CSI */
909 /* process_csi_seq (); */ 907 /* process_csi_seq (); */
910 } 908 }
911 909
912 ch = NOCHAR; 910 ch = NOCHAR;
913 } 911 }
914 } 912 }
… …
925 { 923 {
926 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
927 return *cmdbuf_ptr++; 925 return *cmdbuf_ptr++;
928 926
929 wchar_t wc; 927 wchar_t wc;
930 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 928 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
931 929
932 if (len == (size_t)-2) 930 if (len == (size_t)-2)
933 return NOCHAR; 931 return NOCHAR;
934 932
935 if (len == (size_t)-1) 933 if (len == (size_t)-1)
… …
941 } 939 }
942 940
943 return NOCHAR; 941 return NOCHAR;
944} 942}
945 943
946/* rxvt_cmd_getc() - Return next input character */ 944/* rxvt_cmd_getc () - Return next input character */
947/* 945/*
948 * Return the next input character after first passing any keyboard input 946 * Return the next input character after first passing any keyboard input
949 * to the command. 947 * to the command.
950 */ 948 */
951uint32_t 949uint32_t
… …
961 // would be preferred. either setjmp/longjmp or better design. 959 // would be preferred. either setjmp/longjmp or better design.
962 fcntl (cmd_fd, F_SETFL, 0); 960 fcntl (cmd_fd, F_SETFL, 0);
963 pty_fill (); 961 pty_fill ();
964 fcntl (cmd_fd, F_SETFL, O_NONBLOCK); 962 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
965 } 963 }
966
967#if 0
968#define TIMEOUT_USEC 5000
969 fd_set readfds;
970 int quick_timeout, select_res;
971 int want_motion_time, want_keypress_time;
972 struct timeval value;
973#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
974 struct timeval tp;
975#endif
976
977 for (;;) {
978 /* loop until we can return something */
979
980 if (v_bufstr < v_bufptr) /* output any pending chars */
981 tt_write(NULL, 0);
982
983#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
984 if (mouse_slip_wheel_speed) {
985 quick_timeout = 1;
986 if (!mouse_slip_wheel_delay--
987 && scr_page (mouse_slip_wheel_speed > 0 ? UP : DN,
988 abs(mouse_slip_wheel_speed))) {
989 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
990 refresh_type |= SMOOTH_REFRESH;
991 want_refresh = 1;
992 }
993 }
994#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
995#ifdef SELECTION_SCROLLING
996 if (pending_scroll_selection) {
997 quick_timeout = 1;
998 if (!scroll_selection_delay--
999 && scr_page (scroll_selection_dir,
1000 scroll_selection_lines)) {
1001 selection_extend (selection_save_x,
1002 selection_save_y, selection_save_state);
1003 scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1004 refresh_type |= SMOOTH_REFRESH;
1005 want_refresh = 1;
1006 }
1007 }
1008#endif
1009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1010 if (scrollbar_isUp() || scrollbar_isDn()) {
1011 quick_timeout = 1;
1012 if (!scroll_arrow_delay--
1013 && scr_page (scrollbar_isUp() ? UP : DN, 1)) {
1014 scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1015 refresh_type |= SMOOTH_REFRESH;
1016 want_refresh = 1;
1017 }
1018 }
1019#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1020
1021#ifdef TRANSPARENT
1022 quick_timeout |= want_full_refresh;
1023#endif
1024#endif
1025} 964}
1026 965
1027#ifdef POINTER_BLANK 966#ifdef POINTER_BLANK
1028void 967void
1029rxvt_term::pointer_unblank () 968rxvt_term::pointer_unblank ()
1030{ 969{
1031 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 970 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1032 recolour_cursor (); 971 recolour_cursor ();
1033 972
1034 hidden_pointer = 0; 973 hidden_pointer = 0;
1035 974
1036 if (Options & Opt_pointerBlank) 975 if (Options & Opt_pointerBlank)
… …
1038} 977}
1039 978
1040void 979void
1041rxvt_term::pointer_blank () 980rxvt_term::pointer_blank ()
1042{ 981{
1043 if (!(Options & Opt_pointerBlank)) 982 if (! (Options & Opt_pointerBlank))
1044 return; 983 return;
1045 984
1046 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 985 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1047 XFlush (Xdisplay); 986 XFlush (display->display);
1048 987
1049 hidden_pointer = 1; 988 hidden_pointer = 1;
1050} 989}
1051 990
1052void 991void
… …
1058 pointer_blank (); 997 pointer_blank ();
1059} 998}
1060#endif 999#endif
1061 1000
1062void 1001void
1063rxvt_term::mouse_report (const XButtonEvent *ev) 1002rxvt_term::mouse_report (const XButtonEvent &ev)
1064{ 1003{
1065 int button_number, key_state = 0; 1004 int button_number, key_state = 0;
1066 int x, y; 1005 int x, y;
1067 1006
1068 x = ev->x; 1007 x = ev.x;
1069 y = ev->y; 1008 y = ev.y;
1070 pixel_position (&x, &y); 1009 pixel_position (&x, &y);
1071 1010
1072 if (MEvent.button == AnyButton) { 1011 if (MEvent.button == AnyButton)
1012 {
1073 button_number = 3; 1013 button_number = 3;
1074 } else { 1014 }
1015 else
1016 {
1075 button_number = MEvent.button - Button1; 1017 button_number = MEvent.button - Button1;
1076 /* add 0x3D for wheel events, like xterm does */ 1018 /* add 0x3D for wheel events, like xterm does */
1077 if (button_number >= 3) 1019 if (button_number >= 3)
1078 button_number += (64 - 3); 1020 button_number += (64 - 3);
1079 } 1021 }
1080 1022
1081 if (PrivateModes & PrivMode_MouseX10) { 1023 if (PrivateModes & PrivMode_MouseX10)
1024 {
1082 /* 1025 /*
1083 * do not report ButtonRelease 1026 * do not report ButtonRelease
1084 * no state info allowed 1027 * no state info allowed
1085 */ 1028 */
1086 key_state = 0; 1029 key_state = 0;
1087 if (button_number == 3) 1030 if (button_number == 3)
1088 return; 1031 return;
1089 } else { 1032 }
1033 else
1034 {
1090 /* XTerm mouse reporting needs these values: 1035 /* XTerm mouse reporting needs these values:
1091 * 4 = Shift 1036 * 4 = Shift
1092 * 8 = Meta 1037 * 8 = Meta
1093 * 16 = Control 1038 * 16 = Control
1094 * plus will add in our own Double-Click reporting 1039 * plus will add in our own Double-Click reporting
1095 * 32 = Double Click 1040 * 32 = Double Click
1096 */ 1041 */
1097 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1042 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1098 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1043 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1099 + ((MEvent.state & ControlMask) ? 16 : 0); 1044 + ((MEvent.state & ControlMask) ? 16 : 0);
1100#ifdef MOUSE_REPORT_DOUBLECLICK 1045#ifdef MOUSE_REPORT_DOUBLECLICK
1101 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1046 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1102#endif 1047#endif
1048
1103 } 1049 }
1104 1050
1105#ifdef DEBUG_MOUSEREPORT 1051#ifdef DEBUG_MOUSEREPORT
1106 fprintf(stderr, "Mouse ["); 1052 fprintf (stderr, "Mouse [");
1107 if (key_state & 16) 1053 if (key_state & 16)
1108 fputc('C', stderr); 1054 fputc ('C', stderr);
1109 if (key_state & 4) 1055 if (key_state & 4)
1110 fputc('S', stderr); 1056 fputc ('S', stderr);
1111 if (key_state & 8) 1057 if (key_state & 8)
1112 fputc('A', stderr); 1058 fputc ('A', stderr);
1113 if (key_state & 32) 1059 if (key_state & 32)
1114 fputc('2', stderr); 1060 fputc ('2', stderr);
1115 fprintf(stderr, "]: <%d>, %d/%d\n", 1061 fprintf (stderr, "]: <%d>, %d/%d\n",
1116 button_number, 1062 button_number,
1117 x + 1, 1063 x + 1,
1118 y + 1); 1064 y + 1);
1119#else 1065#else
1120 tt_printf("\033[M%c%c%c", 1066 tt_printf ("\033[M%c%c%c",
1121 (32 + button_number + key_state), 1067 (32 + button_number + key_state),
1122 (32 + x + 1), 1068 (32 + x + 1),
1123 (32 + y + 1)); 1069 (32 + y + 1));
1124#endif 1070#endif
1125} 1071}
1126 1072
1127#ifdef USING_W11LIB 1073#ifdef USING_W11LIB
1128void 1074void
1129rxvt_W11_process_x_event(XEvent *ev) 1075rxvt_W11_process_x_event (XEvent *ev)
1130{ 1076{
1131 rxvt_t *r = rxvt_get_r(); 1077 rxvt_t *r = rxvt_get_r ();
1132 1078
1133 process_x_event (ev); 1079 x_cb (*ev);
1134} 1080}
1135#endif 1081#endif
1136 1082
1137/*{{{ process an X event */ 1083/*{{{ process an X event */
1138void 1084void
1139rxvt_term::process_x_event (XEvent *ev) 1085rxvt_term::x_cb (XEvent &ev)
1140{ 1086{
1087 SET_R (this);
1088 SET_LOCALE (locale);
1089
1090#if defined(CURSOR_BLINK)
1091 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1092 {
1093 if (hidden_cursor)
1094 {
1095 hidden_cursor = 0;
1096 want_refresh = 1;
1097 }
1098
1099 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1100 }
1101#endif
1102
1103#if defined(POINTER_BLANK)
1104 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1105 {
1106 if (ev.type == MotionNotify
1107 || ev.type == ButtonPress
1108 || ev.type == ButtonRelease)
1109 if (hidden_pointer)
1110 pointer_unblank ();
1111
1112 if (ev.type == KeyPress && hidden_pointer == 0)
1113 pointer_blank ();
1114 }
1115#endif
1116
1117#ifdef USE_XIM
1118 if (XFilterEvent (&ev, None))
1119 return;
1120#endif
1121
1141 Window unused_root, unused_child; 1122 Window unused_root, unused_child;
1142 int unused_root_x, unused_root_y; 1123 int unused_root_x, unused_root_y;
1143 unsigned int unused_mask; 1124 unsigned int unused_mask;
1144 1125
1145#ifdef DEBUG_X 1126#ifdef DEBUG_X
1146 const char *const eventnames[] = 1127 const char *const eventnames[] =
1147 { /* mason - this matches my system */ 1128 { /* mason - this matches my system */
1148 "", 1129 "",
1149 "", 1130 "",
1150 "KeyPress", 1131 "KeyPress",
1151 "KeyRelease", 1132 "KeyRelease",
1152 "ButtonPress", 1133 "ButtonPress",
1153 "ButtonRelease", 1134 "ButtonRelease",
1154 "MotionNotify", 1135 "MotionNotify",
1155 "EnterNotify", 1136 "EnterNotify",
1156 "LeaveNotify", 1137 "LeaveNotify",
1157 "FocusIn", 1138 "FocusIn",
1158 "FocusOut", 1139 "FocusOut",
1159 "KeymapNotify", 1140 "KeymapNotify",
1160 "Expose", 1141 "Expose",
1161 "GraphicsExpose", 1142 "GraphicsExpose",
1162 "NoExpose", 1143 "NoExpose",
1163 "VisibilityNotify", 1144 "VisibilityNotify",
1164 "CreateNotify", 1145 "CreateNotify",
1165 "DestroyNotify", 1146 "DestroyNotify",
1166 "UnmapNotify", 1147 "UnmapNotify",
1167 "MapNotify", 1148 "MapNotify",
1168 "MapRequest", 1149 "MapRequest",
1169 "ReparentNotify", 1150 "ReparentNotify",
1170 "ConfigureNotify", 1151 "ConfigureNotify",
1171 "ConfigureRequest", 1152 "ConfigureRequest",
1172 "GravityNotify", 1153 "GravityNotify",
1173 "ResizeRequest", 1154 "ResizeRequest",
1174 "CirculateNotify", 1155 "CirculateNotify",
1175 "CirculateRequest", 1156 "CirculateRequest",
1176 "PropertyNotify", 1157 "PropertyNotify",
1177 "SelectionClear", 1158 "SelectionClear",
1178 "SelectionRequest", 1159 "SelectionRequest",
1179 "SelectionNotify", 1160 "SelectionNotify",
1180 "ColormapNotify", 1161 "ColormapNotify",
1181 "ClientMessage", 1162 "ClientMessage",
1182 "MappingNotify" 1163 "MappingNotify"
1183 }; 1164 };
1184#endif 1165#endif
1185 1166
1186#ifdef DEBUG_X 1167#ifdef DEBUG_X
1187 struct timeval tp; 1168 struct timeval tp;
1188 struct tm *ltt; 1169 struct tm *ltt;
1189 (void)gettimeofday(&tp, NULL); 1170 (void)gettimeofday (&tp, NULL);
1190 ltt = localtime(&(tp.tv_sec)); 1171 ltt = localtime (& (tp.tv_sec));
1191 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)); 1172 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));
1192#endif 1173#endif
1193 1174
1194 switch (ev->type) { 1175 switch (ev.type)
1176 {
1195 case KeyPress: 1177 case KeyPress:
1196 lookup_key ((XKeyEvent *)ev); 1178 lookup_key (ev.xkey);
1197 break; 1179 break;
1198 1180
1199#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1200 case KeyRelease: 1182 case KeyRelease:
1201 { 1183 {
1202 if (!(ev->xkey.state & ControlMask)) 1184 if (! (ev.xkey.state & ControlMask))
1203 mouse_slip_wheel_speed = 0;
1204 else {
1205 KeySym ks;
1206
1207 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0);
1208 if (ks == XK_Control_L || ks == XK_Control_R)
1209 mouse_slip_wheel_speed = 0; 1185 mouse_slip_wheel_speed = 0;
1210 } 1186 else
1211 break; 1187 {
1212 } 1188 KeySym ks;
1213#endif
1214 1189
1190 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1191 if (ks == XK_Control_L || ks == XK_Control_R)
1192 mouse_slip_wheel_speed = 0;
1193 }
1194 break;
1195 }
1196#endif
1197
1215 case ButtonPress: 1198 case ButtonPress:
1216 button_press ((XButtonEvent *)ev); 1199 button_press (ev.xbutton);
1217 break; 1200 break;
1218 1201
1219 case ButtonRelease: 1202 case ButtonRelease:
1220 button_release ((XButtonEvent *)ev); 1203 button_release (ev.xbutton);
1221 break; 1204 break;
1222 1205
1223 case ClientMessage: 1206 case ClientMessage:
1224 if (ev->xclient.format == 32 1207 if (ev.xclient.format == 32
1225 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1208 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1226 destroy (); 1209 destroy ();
1227#ifdef OFFIX_DND 1210#ifdef OFFIX_DND
1228 /* OffiX Dnd (drag 'n' drop) protocol */ 1211 /* OffiX Dnd (drag 'n' drop) protocol */
1229 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1212 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1230 && (ev->xclient.data.l[0] == DndFile 1213 && (ev.xclient.data.l[0] == DndFile
1231 || ev->xclient.data.l[0] == DndDir 1214 || ev.xclient.data.l[0] == DndDir
1232 || ev->xclient.data.l[0] == DndLink)) { 1215 || ev.xclient.data.l[0] == DndLink))
1233 /* Get Dnd data */ 1216 {
1217 /* Get Dnd data */
1234 Atom ActualType; 1218 Atom ActualType;
1235 int ActualFormat; 1219 int ActualFormat;
1236 unsigned char *data; 1220 unsigned char *data;
1237 unsigned long Size, RemainingBytes; 1221 unsigned long Size, RemainingBytes;
1238 1222
1239 XGetWindowProperty(Xdisplay, Xroot, 1223 XGetWindowProperty (display->display, display->root,
1240 xa[XA_DNDSELECTION], 1224 xa[XA_DNDSELECTION],
1241 0L, 1000000L, 1225 0L, 1000000L,
1242 False, AnyPropertyType, 1226 False, AnyPropertyType,
1243 &ActualType, &ActualFormat, 1227 &ActualType, &ActualFormat,
1244 &Size, &RemainingBytes, 1228 &Size, &RemainingBytes,
1245 &data); 1229 &data);
1246 XChangeProperty(Xdisplay, Xroot, 1230 XChangeProperty (display->display, display->root,
1247 XA_CUT_BUFFER0, XA_STRING, 1231 XA_CUT_BUFFER0, XA_STRING,
1248 8, PropModeReplace, 1232 8, PropModeReplace,
1249 data, STRLEN(data)); 1233 data, STRLEN (data));
1250 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1234 selection_paste (display->root, XA_CUT_BUFFER0, True);
1251 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1235 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1252 } 1236 }
1253#endif /* OFFIX_DND */ 1237#endif /* OFFIX_DND */
1254 break; 1238 break;
1255 1239
1256 case MappingNotify: 1240 case MappingNotify:
1257 XRefreshKeyboardMapping(&(ev->xmapping)); 1241 XRefreshKeyboardMapping (& (ev.xmapping));
1258 break; 1242 break;
1259 1243
1260 /* 1244 /*
1261 * XXX: this is not the _current_ arrangement 1245 * XXX: this is not the _current_ arrangement
1262 * Here's my conclusion: 1246 * Here's my conclusion:
1263 * If the window is completely unobscured, use bitblt's 1247 * If the window is completely unobscured, use bitblt's
1264 * to scroll. Even then, they're only used when doing partial 1248 * to scroll. Even then, they're only used when doing partial
1265 * screen scrolling. When partially obscured, we have to fill 1249 * screen scrolling. When partially obscured, we have to fill
1266 * in the GraphicsExpose parts, which means that after each refresh, 1250 * in the GraphicsExpose parts, which means that after each refresh,
1267 * we need to wait for the graphics expose or Noexpose events, 1251 * we need to wait for the graphics expose or Noexpose events,
1268 * which ought to make things real slow! 1252 * which ought to make things real slow!
1269 */ 1253 */
1270 case VisibilityNotify: 1254 case VisibilityNotify:
1271 switch (ev->xvisibility.state) 1255 switch (ev.xvisibility.state)
1272 { 1256 {
1273 case VisibilityUnobscured: 1257 case VisibilityUnobscured:
1274 refresh_type = FAST_REFRESH; 1258 refresh_type = FAST_REFRESH;
1275 break; 1259 break;
1276 case VisibilityPartiallyObscured: 1260 case VisibilityPartiallyObscured:
… …
1278 break; 1262 break;
1279 default: 1263 default:
1280 refresh_type = NO_REFRESH; 1264 refresh_type = NO_REFRESH;
1281 break; 1265 break;
1282 } 1266 }
1283 break; 1267 break;
1284 1268
1285 case FocusIn: 1269 case FocusIn:
1286 if (!TermWin.focus) { 1270 if (!TermWin.focus)
1271 {
1287 TermWin.focus = 1; 1272 TermWin.focus = 1;
1288 want_refresh = 1; 1273 want_refresh = 1;
1289#ifdef USE_XIM 1274#ifdef USE_XIM
1290 if (Input_Context != NULL) 1275 if (Input_Context != NULL)
1291 XSetICFocus(Input_Context); 1276 XSetICFocus (Input_Context);
1292#endif 1277#endif
1293#ifdef CURSOR_BLINK 1278#ifdef CURSOR_BLINK
1294 if (Options & Opt_cursorBlink) 1279 if (Options & Opt_cursorBlink)
1295 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1280 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1296#endif 1281#endif
1297 }
1298 break;
1299 1282
1283 }
1284 break;
1285
1300 case FocusOut: 1286 case FocusOut:
1301 if (TermWin.focus) { 1287 if (TermWin.focus)
1288 {
1302 TermWin.focus = 0; 1289 TermWin.focus = 0;
1303 want_refresh = 1; 1290 want_refresh = 1;
1304#ifdef USE_XIM 1291#ifdef USE_XIM
1305 if (Input_Context != NULL) 1292 if (Input_Context != NULL)
1306 XUnsetICFocus(Input_Context); 1293 XUnsetICFocus (Input_Context);
1307#endif 1294#endif
1308#ifdef CURSOR_BLINK 1295#ifdef CURSOR_BLINK
1309 if (Options & Opt_cursorBlink) 1296 if (Options & Opt_cursorBlink)
1310 cursor_blink_ev.stop (); 1297 cursor_blink_ev.stop ();
1311 hidden_cursor = 0; 1298 hidden_cursor = 0;
1312#endif 1299#endif
1313 }
1314 break;
1315 1300
1301 }
1302 break;
1303
1316 case ConfigureNotify: 1304 case ConfigureNotify:
1317 if (ev->xconfigure.window == TermWin.parent[0]) { 1305 if (ev.xconfigure.window == TermWin.parent[0])
1318 int height, width; 1306 {
1307 int height, width;
1319 1308
1309 do
1320 do { /* Wrap lots of configures into one */ 1310 { /* Wrap lots of configures into one */
1321 width = ev->xconfigure.width; 1311 width = ev.xconfigure.width;
1322 height = ev->xconfigure.height; 1312 height = ev.xconfigure.height;
1323 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1313 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1324 } while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1314 }
1325 ConfigureNotify, ev)); 1315 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1316
1326 if (szHint.width != width || szHint.height != height) { 1317 if (szHint.width != width || szHint.height != height)
1318 {
1327 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1319 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1328 resize_all_windows (width, height, 1); 1320 resize_all_windows (width, height, 1);
1329 } 1321 }
1330#ifdef DEBUG_SIZE 1322#ifdef DEBUG_SIZE
1331 else { 1323 else
1324 {
1332 D_SIZE((stderr, "Size: Not resizing")); 1325 D_SIZE ((stderr, "Size: Not resizing"));
1333 } 1326 }
1334#endif 1327#endif
1335#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1328#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1336 if (Options & Opt_transparent) { 1329 if (Options & Opt_transparent)
1337 check_our_parents (); 1330 {
1338 if (am_transparent) 1331 check_our_parents ();
1332 if (am_transparent)
1339 want_full_refresh = 1; 1333 want_full_refresh = 1;
1340 } 1334 }
1341#endif 1335#endif
1342 }
1343 break;
1344 1336
1337 }
1338 break;
1339
1345 case SelectionClear: 1340 case SelectionClear:
1346 selection_clear (); 1341 display->set_selection_owner (0);
1347 break; 1342 break;
1348 1343
1349 case SelectionNotify: 1344 case SelectionNotify:
1350 if (selection_wait == Sel_normal) 1345 if (selection_wait == Sel_normal)
1351 selection_paste (ev->xselection.requestor, 1346 selection_paste (ev.xselection.requestor,
1352 ev->xselection.property, True); 1347 ev.xselection.property, True);
1353 break; 1348 break;
1354 1349
1355 case SelectionRequest: 1350 case SelectionRequest:
1356 selection_send (&(ev->xselectionrequest)); 1351 selection_send (ev.xselectionrequest);
1357 break; 1352 break;
1358 1353
1359 case UnmapNotify: 1354 case UnmapNotify:
1360 TermWin.mapped = 0; 1355 TermWin.mapped = 0;
1361#ifdef TEXT_BLINK 1356#ifdef TEXT_BLINK
1362 text_blink_ev.stop (); 1357 text_blink_ev.stop ();
1363#endif 1358#endif
1364 break; 1359 break;
1365 1360
1366 case MapNotify: 1361 case MapNotify:
1367 TermWin.mapped = 1; 1362 TermWin.mapped = 1;
1368#ifdef TEXT_BLINK 1363#ifdef TEXT_BLINK
1369 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1364 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1370#endif 1365#endif
1371 break;
1372
1373 case PropertyNotify:
1374 if (ev->xproperty.atom == xa[XA_VT_SELECTION]) {
1375 if (ev->xproperty.state == PropertyNewValue)
1376 selection_property (ev->xproperty.window,
1377 ev->xproperty.atom);
1378 break; 1366 break;
1379 } 1367
1380#ifdef TRANSPARENT 1368#ifdef TRANSPARENT
1381 /*
1382 * if user used some Esetroot compatible prog to set the root bg,
1383 * use the property to determine the pixmap. We use it later on.
1384 */
1385 if (xa[XA_XROOTPMAPID] == 0)
1386 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1387 "_XROOTPMAP_ID", False);
1388 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1389 break;
1390 /* FALLTHROUGH */
1391 case ReparentNotify: 1369 case ReparentNotify:
1392 if ((Options & Opt_transparent) && check_our_parents ()) { 1370 rootwin_cb (ev);
1393 if (am_transparent) 1371 break;
1394 want_full_refresh = 1;
1395 }
1396#endif /* TRANSPARENT */ 1372#endif /* TRANSPARENT */
1397 break;
1398 1373
1399 case GraphicsExpose: 1374 case GraphicsExpose:
1400 case Expose: 1375 case Expose:
1401 if (ev->xany.window == TermWin.vt) { 1376 if (ev.xany.window == TermWin.vt)
1377 {
1402#ifdef NO_SLOW_LINK_SUPPORT 1378#ifdef NO_SLOW_LINK_SUPPORT
1403 scr_expose (ev->xexpose.x, ev->xexpose.y, 1379 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev->xexpose.width, ev->xexpose.height, False); 1380 ev.xexpose.width, ev.xexpose.height, False);
1405#else 1381#else
1406 // don't understand this, so commented it out 1382 // don't understand this, so commented it out
1407 scr_expose (ev->xexpose.x, ev->xexpose.y, 1383 scr_expose (ev.xexpose.x, ev.xexpose.y,
1408 ev->xexpose.width, ev->xexpose.height, False); 1384 ev.xexpose.width, ev.xexpose.height, False);
1409 //scr_expose (ev->xexpose.x, 0, 1385 //scr_expose (ev.xexpose.x, 0,
1410 // ev->xexpose.width, TermWin.height, False); 1386 // ev.xexpose.width, TermWin.height, False);
1411#endif 1387#endif
1412 want_refresh = 1; 1388 want_refresh = 1;
1413 } else { 1389 }
1414 XEvent unused_xevent; 1390 else
1391 {
1392 XEvent unused_event;
1415 1393
1416 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1394 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1417 Expose, 1395 Expose,
1418 &unused_xevent)) ; 1396 &unused_event)) ;
1419 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1397 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1420 GraphicsExpose, 1398 GraphicsExpose,
1421 &unused_xevent)) ; 1399 &unused_event)) ;
1422 if (isScrollbarWindow(ev->xany.window)) { 1400 if (isScrollbarWindow (ev.xany.window))
1423 scrollBar.setIdle(); 1401 {
1424 scrollbar_show (0); 1402 scrollBar.setIdle ();
1425 } 1403 scrollbar_show (0);
1404 }
1426#ifdef MENUBAR 1405#ifdef MENUBAR
1427 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1406 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1428 menubar_expose (); 1407 menubar_expose ();
1429#endif 1408#endif
1430#ifdef RXVT_GRAPHICS 1409 }
1431 Gr_expose (ev->xany.window); 1410 break;
1432#endif
1433 }
1434 break;
1435 1411
1436 case MotionNotify: 1412 case MotionNotify:
1437#ifdef POINTER_BLANK 1413#ifdef POINTER_BLANK
1438 if (hidden_pointer) 1414 if (hidden_pointer)
1439 pointer_unblank (); 1415 pointer_unblank ();
1440#endif 1416#endif
1441#if MENUBAR 1417#if MENUBAR
1442 if (isMenuBarWindow(ev->xany.window)) { 1418 if (isMenuBarWindow (ev.xany.window))
1419 {
1443 menubar_control (&(ev->xbutton)); 1420 menubar_control (& (ev.xbutton));
1444 break; 1421 break;
1445 } 1422 }
1446#endif 1423#endif
1447 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1424 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1448 break; 1425 break;
1449 1426
1450 if (ev->xany.window == TermWin.vt) { 1427 if (ev.xany.window == TermWin.vt)
1428 {
1451 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1429 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1452 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1430 {
1453 MotionNotify, ev)) ; 1431 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1454 XQueryPointer(Xdisplay, TermWin.vt, 1432 ;
1455 &unused_root, &unused_child, 1433
1456 &unused_root_x, &unused_root_y, 1434 XQueryPointer (display->display, TermWin.vt,
1457 &(ev->xbutton.x), &(ev->xbutton.y), 1435 &unused_root, &unused_child,
1458 &unused_mask); 1436 &unused_root_x, &unused_root_y,
1437 & (ev.xbutton.x), & (ev.xbutton.y),
1438 &unused_mask);
1459#ifdef MOUSE_THRESHOLD 1439#ifdef MOUSE_THRESHOLD
1460 /* deal with a `jumpy' mouse */ 1440 /* deal with a `jumpy' mouse */
1461 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) { 1441 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1442 {
1462#endif 1443#endif
1463 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1444 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1464 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1445 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1465#ifdef SELECTION_SCROLLING 1446#ifdef SELECTION_SCROLLING
1466 if (ev->xbutton.y < TermWin.int_bwidth 1447 if (ev.xbutton.y < TermWin.int_bwidth
1467 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) { 1448 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1468 int dist;
1469
1470 pending_scroll_selection=1;
1471
1472 /* don't clobber the current delay if we are
1473 * already in the middle of scrolling.
1474 */
1475 if (scroll_selection_delay<=0)
1476 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1477
1478 /* save the event params so we can highlight
1479 * the selection in the pending-scroll loop
1480 */
1481 selection_save_x=ev->xbutton.x;
1482 selection_save_y=ev->xbutton.y;
1483 selection_save_state=
1484 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1485
1486 /* calc number of lines to scroll */
1487 if (ev->xbutton.y<TermWin.int_bwidth) {
1488 scroll_selection_dir = UP;
1489 dist = TermWin.int_bwidth - ev->xbutton.y;
1490 }
1491 else {
1492 scroll_selection_dir = DN;
1493 dist = ev->xbutton.y -
1494 (TermWin.int_bwidth + TermWin.height);
1495 }
1496 scroll_selection_lines=(Pixel2Height(dist)/
1497 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1498 MIN_IT(scroll_selection_lines,
1499 SELECTION_SCROLL_MAX_LINES);
1500 }
1501 else {
1502 /* we are within the text window, so we
1503 * shouldn't be scrolling
1504 */
1505 pending_scroll_selection = 0;
1506 }
1507#endif
1508#ifdef MOUSE_THRESHOLD
1509 }
1510#endif
1511 }
1512 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1513 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win,
1514 MotionNotify, ev)) ;
1515 XQueryPointer(Xdisplay, scrollBar.win,
1516 &unused_root, &unused_child,
1517 &unused_root_x, &unused_root_y,
1518 &(ev->xbutton.x), &(ev->xbutton.y),
1519 &unused_mask);
1520 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO,
1521 scrollbar_size());
1522 scr_refresh (refresh_type);
1523 refresh_limit = 0;
1524 scrollbar_show (1);
1525 }
1526 break;
1527 }
1528}
1529
1530void
1531rxvt_term::button_press (XButtonEvent *ev)
1532{
1533 int reportmode = 0, clickintime;
1534
1535 bypass_keystate = ev->state & (ModMetaMask | ShiftMask);
1536 if (!bypass_keystate)
1537 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1538/*
1539 * VT window processing of button press
1540 */
1541 if (ev->window == TermWin.vt)
1542 {
1543#if RXVT_GRAPHICS
1544 if (ev->subwindow != None)
1545 rxvt_Gr_ButtonPress (ev->x, ev->y);
1546 else
1547#endif
1548 {
1549 clickintime = ev->time - MEvent.time < MULTICLICK_TIME;
1550 if (reportmode)
1551 {
1552 /* mouse report from vt window */
1553 /* save the xbutton state (for ButtonRelease) */
1554 MEvent.state = ev->state;
1555#ifdef MOUSE_REPORT_DOUBLECLICK
1556 if (ev->button == MEvent.button && clickintime)
1557 {
1558 /* same button, within alloted time */
1559 MEvent.clicks++;
1560 if (MEvent.clicks > 1)
1561 { 1449 {
1562 /* only report double clicks */ 1450 int dist;
1563 MEvent.clicks = 2;
1564 mouse_report (ev);
1565 1451
1566 /* don't report the release */ 1452 pending_scroll_selection=1;
1567 MEvent.clicks = 0; 1453
1568 MEvent.button = AnyButton; 1454 /* don't clobber the current delay if we are
1569 } 1455 * already in the middle of scrolling.
1570 }
1571 else
1572 { 1456 */
1573 /* different button, or time expired */ 1457 if (scroll_selection_delay<=0)
1574 MEvent.clicks = 1; 1458 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1575 MEvent.button = ev->button; 1459
1576 mouse_report (ev); 1460 /* save the event params so we can highlight
1577 } 1461 * the selection in the pending-scroll loop
1578#else
1579 MEvent.button = ev->button;
1580 mouse_report (ev);
1581#endif /* MOUSE_REPORT_DOUBLECLICK */
1582 }
1583 else
1584 {
1585 if (ev->button != MEvent.button)
1586 MEvent.clicks = 0;
1587 switch (ev->button)
1588 { 1462 */
1589 case Button1: 1463 selection_save_x=ev.xbutton.x;
1590 /* allow shift+left click to extend selection */ 1464 selection_save_y=ev.xbutton.y;
1591 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1465 selection_save_state=
1466 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1467
1468 /* calc number of lines to scroll */
1469 if (ev.xbutton.y<TermWin.int_bwidth)
1592 { 1470 {
1593 if (MEvent.button == Button1 && clickintime) 1471 scroll_selection_dir = UP;
1594 selection_rotate (ev->x, ev->y); 1472 dist = TermWin.int_bwidth - ev.xbutton.y;
1595 else
1596 selection_extend (ev->x, ev->y, 1);
1597 } 1473 }
1598 else 1474 else
1599 { 1475 {
1600 if (MEvent.button == Button1 && clickintime) 1476 scroll_selection_dir = DN;
1601 MEvent.clicks++; 1477 dist = ev.xbutton.y -
1602 else 1478 (TermWin.int_bwidth + TermWin.height);
1603 MEvent.clicks = 1;
1604
1605 selection_click (MEvent.clicks, ev->x, ev->y);
1606 } 1479 }
1480 scroll_selection_lines= (Pixel2Height (dist)/
1481 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1482 MIN_IT (scroll_selection_lines,
1483 SELECTION_SCROLL_MAX_LINES);
1484 }
1485 else
1486 {
1487 /* we are within the text window, so we
1488 * shouldn't be scrolling
1489 */
1490 pending_scroll_selection = 0;
1491 }
1492#endif
1493#ifdef MOUSE_THRESHOLD
1607 1494
1495 }
1496#endif
1497
1498 }
1499 }
1500 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1501 {
1502 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1503 MotionNotify, &ev)) ;
1504 XQueryPointer (display->display, scrollBar.win,
1505 &unused_root, &unused_child,
1506 &unused_root_x, &unused_root_y,
1507 & (ev.xbutton.x), & (ev.xbutton.y),
1508 &unused_mask);
1509 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1510 scrollbar_size ());
1511 scr_refresh (refresh_type);
1512 refresh_limit = 0;
1513 scrollbar_show (1);
1514 }
1515 break;
1516 }
1517}
1518
1519void
1520rxvt_term::rootwin_cb (XEvent &ev)
1521{
1522 SET_R (this);
1523 SET_LOCALE (locale);
1524
1525 switch (ev.type)
1526 {
1527 case PropertyNotify:
1528 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1529 {
1530 if (ev.xproperty.state == PropertyNewValue)
1531 selection_property (ev.xproperty.window, ev.xproperty.atom);
1532 break;
1533 }
1534#ifdef TRANSPARENT
1535 else
1536 {
1537 /*
1538 * if user used some Esetroot compatible prog to set the root bg,
1539 * use the property to determine the pixmap. We use it later on.
1540 */
1541 if (xa[XA_XROOTPMAPID] == 0)
1542 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1543
1544 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1545 return;
1546 }
1547
1548 /* FALLTHROUGH */
1549 case ReparentNotify:
1550 if ((Options & Opt_transparent) && check_our_parents ())
1551 if (am_transparent)
1552 want_full_refresh = 1;
1553 break;
1554#endif
1555 }
1556}
1557
1558void
1559rxvt_term::button_press (const XButtonEvent &ev)
1560{
1561 int reportmode = 0, clickintime;
1562
1563 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1564 if (!bypass_keystate)
1565 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1566 /*
1567 * VT window processing of button press
1568 */
1569 if (ev.window == TermWin.vt)
1570 {
1571 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1572 if (reportmode)
1573 {
1574 /* mouse report from vt window */
1575 /* save the xbutton state (for ButtonRelease) */
1576 MEvent.state = ev.state;
1577#ifdef MOUSE_REPORT_DOUBLECLICK
1578 if (ev.button == MEvent.button && clickintime)
1579 {
1580 /* same button, within alloted time */
1581 MEvent.clicks++;
1582 if (MEvent.clicks > 1)
1583 {
1584 /* only report double clicks */
1585 MEvent.clicks = 2;
1586 mouse_report (ev);
1587
1588 /* don't report the release */
1589 MEvent.clicks = 0;
1590 MEvent.button = AnyButton;
1591 }
1592 }
1593 else
1594 {
1595 /* different button, or time expired */
1596 MEvent.clicks = 1;
1597 MEvent.button = ev.button;
1598 mouse_report (ev);
1599 }
1600#else
1601 MEvent.button = ev.button;
1602 mouse_report (ev);
1603#endif /* MOUSE_REPORT_DOUBLECLICK */
1604
1605 }
1606 else
1607 {
1608 if (ev.button != MEvent.button)
1609 MEvent.clicks = 0;
1610 switch (ev.button)
1611 {
1612 case Button1:
1613 /* allow shift+left click to extend selection */
1614 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1615 {
1616 if (MEvent.button == Button1 && clickintime)
1617 selection_rotate (ev.x, ev.y);
1618 else
1619 selection_extend (ev.x, ev.y, 1);
1620 }
1621 else
1622 {
1623 if (MEvent.button == Button1 && clickintime)
1624 MEvent.clicks++;
1625 else
1626 MEvent.clicks = 1;
1627
1628 selection_click (MEvent.clicks, ev.x, ev.y);
1629 }
1630
1608 MEvent.button = Button1; 1631 MEvent.button = Button1;
1632 break;
1633
1634 case Button3:
1635 if (MEvent.button == Button3 && clickintime)
1636 selection_rotate (ev.x, ev.y);
1637 else
1638 selection_extend (ev.x, ev.y, 1);
1639 MEvent.button = Button3;
1640 break;
1641 }
1642 }
1643 MEvent.time = ev.time;
1644 return;
1645 }
1646
1647 /*
1648 * Scrollbar window processing of button press
1649 */
1650 if (isScrollbarWindow (ev.window))
1651 {
1652 scrollBar.setIdle ();
1653 /*
1654 * Rxvt-style scrollbar:
1655 * move up if mouse is above slider
1656 * move dn if mouse is below slider
1657 *
1658 * XTerm-style scrollbar:
1659 * Move display proportional to pointer location
1660 * pointer near top -> scroll one line
1661 * pointer near bot -> scroll full page
1662 */
1663#ifndef NO_SCROLLBAR_REPORT
1664 if (reportmode)
1665 {
1666 /*
1667 * Mouse report disabled scrollbar:
1668 * arrow buttons - send up/down
1669 * click on scrollbar - send pageup/down
1670 */
1671 if ((scrollBar.style == R_SB_NEXT
1672 && scrollbarnext_upButton (ev.y))
1673 || (scrollBar.style == R_SB_RXVT
1674 && scrollbarrxvt_upButton (ev.y)))
1675 tt_printf ("\033[A");
1676 else if ((scrollBar.style == R_SB_NEXT
1677 && scrollbarnext_dnButton (ev.y))
1678 || (scrollBar.style == R_SB_RXVT
1679 && scrollbarrxvt_dnButton (ev.y)))
1680 tt_printf ("\033[B");
1681 else
1682 switch (ev.button)
1683 {
1684 case Button2:
1685 tt_printf ("\014");
1686 break;
1687 case Button1:
1688 tt_printf ("\033[6~");
1689 break;
1690 case Button3:
1691 tt_printf ("\033[5~");
1692 break;
1693 }
1694 }
1695 else
1696#endif /* NO_SCROLLBAR_REPORT */
1697
1698 {
1699 char upordown = 0;
1700
1701 if (scrollBar.style == R_SB_NEXT)
1702 {
1703 if (scrollbarnext_upButton (ev.y))
1704 upordown = -1; /* up */
1705 else if (scrollbarnext_dnButton (ev.y))
1706 upordown = 1; /* down */
1707 }
1708 else if (scrollBar.style == R_SB_RXVT)
1709 {
1710 if (scrollbarrxvt_upButton (ev.y))
1711 upordown = -1; /* up */
1712 else if (scrollbarrxvt_dnButton (ev.y))
1713 upordown = 1; /* down */
1714 }
1715 if (upordown)
1716 {
1717#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1718 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1719#endif
1720 if (scr_page (upordown < 0 ? UP : DN, 1))
1721 {
1722 if (upordown < 0)
1723 scrollBar.setUp ();
1724 else
1725 scrollBar.setDn ();
1726 }
1727 }
1728 else
1729 switch (ev.button)
1730 {
1731 case Button2:
1732 switch (scrollbar_align)
1733 {
1734 case R_SB_ALIGN_TOP:
1735 csrO = 0;
1609 break; 1736 break;
1610 1737 case R_SB_ALIGN_CENTRE:
1611 case Button3: 1738 csrO = (scrollBar.bot - scrollBar.top) / 2;
1612 if (MEvent.button == Button3 && clickintime)
1613 selection_rotate (ev->x, ev->y);
1614 else
1615 selection_extend (ev->x, ev->y, 1);
1616 MEvent.button = Button3;
1617 break; 1739 break;
1740 case R_SB_ALIGN_BOTTOM:
1741 csrO = scrollBar.bot - scrollBar.top;
1742 break;
1743 }
1744 if (scrollBar.style == R_SB_XTERM
1745 || scrollbar_above_slider (ev.y)
1746 || scrollbar_below_slider (ev.y))
1747 scr_move_to ( scrollbar_position (ev.y) - csrO,
1748 scrollbar_size ());
1749 scrollBar.setMotion ();
1750 break;
1751
1752 case Button1:
1753 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1754 csrO = ev.y - scrollBar.top;
1755 /* FALLTHROUGH */
1756
1757 case Button3:
1758 if (scrollBar.style != R_SB_XTERM)
1759 {
1760 if (scrollbar_above_slider (ev.y))
1761# ifdef RXVT_SCROLL_FULL
1762 scr_page (UP, TermWin.nrow - 1);
1763# else
1764 scr_page (UP, TermWin.nrow / 4);
1765# endif
1766 else if (scrollbar_below_slider (ev.y))
1767# ifdef RXVT_SCROLL_FULL
1768 scr_page (DN, TermWin.nrow - 1);
1769# else
1770 scr_page (DN, TermWin.nrow / 4);
1771# endif
1772 else
1773 scrollBar.setMotion ();
1774 }
1775 else
1776 {
1777 scr_page ((ev.button == Button1 ? DN : UP),
1778 (TermWin.nrow
1779 * scrollbar_position (ev.y)
1780 / scrollbar_size ()));
1781 }
1782 break;
1783 }
1618 } 1784 }
1619 }
1620 MEvent.time = ev->time;
1621 return; 1785 return;
1622 }
1623 }
1624
1625/*
1626 * Scrollbar window processing of button press
1627 */
1628 if (isScrollbarWindow(ev->window))
1629 {
1630 scrollBar.setIdle ();
1631 /*
1632 * Rxvt-style scrollbar:
1633 * move up if mouse is above slider
1634 * move dn if mouse is below slider
1635 *
1636 * XTerm-style scrollbar:
1637 * Move display proportional to pointer location
1638 * pointer near top -> scroll one line
1639 * pointer near bot -> scroll full page
1640 */
1641#ifndef NO_SCROLLBAR_REPORT
1642 if (reportmode) {
1643 /*
1644 * Mouse report disabled scrollbar:
1645 * arrow buttons - send up/down
1646 * click on scrollbar - send pageup/down
1647 */
1648 if ((scrollBar.style == R_SB_NEXT
1649 && scrollbarnext_upButton(ev->y))
1650 || (scrollBar.style == R_SB_RXVT
1651 && scrollbarrxvt_upButton(ev->y)))
1652 tt_printf("\033[A");
1653 else if ((scrollBar.style == R_SB_NEXT
1654 && scrollbarnext_dnButton(ev->y))
1655 || (scrollBar.style == R_SB_RXVT
1656 && scrollbarrxvt_dnButton(ev->y)))
1657 tt_printf("\033[B");
1658 else
1659 switch (ev->button) {
1660 case Button2:
1661 tt_printf("\014");
1662 break;
1663 case Button1:
1664 tt_printf("\033[6~");
1665 break;
1666 case Button3:
1667 tt_printf("\033[5~");
1668 break;
1669 }
1670 }
1671 else
1672#endif /* NO_SCROLLBAR_REPORT */
1673 {
1674 char upordown = 0;
1675
1676 if (scrollBar.style == R_SB_NEXT) {
1677 if (scrollbarnext_upButton(ev->y))
1678 upordown = -1; /* up */
1679 else if (scrollbarnext_dnButton(ev->y))
1680 upordown = 1; /* down */
1681 } else if (scrollBar.style == R_SB_RXVT) {
1682 if (scrollbarrxvt_upButton(ev->y))
1683 upordown = -1; /* up */
1684 else if (scrollbarrxvt_dnButton(ev->y))
1685 upordown = 1; /* down */
1686 } 1786 }
1687 if (upordown) { 1787#if MENUBAR
1788 /*
1789 * Menubar window processing of button press
1790 */
1791 if (isMenuBarWindow (ev.window))
1792 menubar_control (ev);
1793#endif
1794}
1795
1796void
1797rxvt_term::button_release (const XButtonEvent &ev)
1798{
1799 int reportmode = 0;
1800
1801 csrO = 0; /* reset csr Offset */
1802 if (!bypass_keystate)
1803 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1804
1805 if (scrollbar_isUpDn ())
1806 {
1807 scrollBar.setIdle ();
1808 scrollbar_show (0);
1688#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1809#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1689 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1810 refresh_type &= ~SMOOTH_REFRESH;
1690#endif
1691 if (scr_page (upordown < 0 ? UP : DN, 1)) {
1692 if (upordown < 0)
1693 scrollBar.setUp ();
1694 else
1695 scrollBar.setDn ();
1696 }
1697 } else
1698 switch (ev->button) {
1699 case Button2:
1700 switch (scrollbar_align) {
1701 case R_SB_ALIGN_TOP:
1702 csrO = 0;
1703 break;
1704 case R_SB_ALIGN_CENTRE:
1705 csrO = (scrollBar.bot - scrollBar.top) / 2;
1706 break;
1707 case R_SB_ALIGN_BOTTOM:
1708 csrO = scrollBar.bot - scrollBar.top;
1709 break;
1710 }
1711 if (scrollBar.style == R_SB_XTERM
1712 || scrollbar_above_slider(ev->y)
1713 || scrollbar_below_slider(ev->y))
1714 scr_move_to ( scrollbar_position(ev->y) - csrO,
1715 scrollbar_size());
1716 scrollBar.setMotion ();
1717 break;
1718
1719 case Button1:
1720 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1721 csrO = ev->y - scrollBar.top;
1722 /* FALLTHROUGH */
1723
1724 case Button3:
1725 if (scrollBar.style != R_SB_XTERM) {
1726 if (scrollbar_above_slider(ev->y))
1727# ifdef RXVT_SCROLL_FULL
1728 scr_page (UP, TermWin.nrow - 1);
1729# else
1730 scr_page (UP, TermWin.nrow / 4);
1731# endif 1811#endif
1732 else if (scrollbar_below_slider(ev->y))
1733# ifdef RXVT_SCROLL_FULL
1734 scr_page (DN, TermWin.nrow - 1);
1735# else
1736 scr_page (DN, TermWin.nrow / 4);
1737# endif
1738 else
1739 scrollBar.setMotion ();
1740 } else {
1741 scr_page ((ev->button == Button1 ? DN : UP),
1742 (TermWin.nrow
1743 * scrollbar_position(ev->y)
1744 / scrollbar_size()));
1745 }
1746 break;
1747 }
1748 }
1749 return;
1750 }
1751#if MENUBAR
1752 /*
1753 * Menubar window processing of button press
1754 */
1755 if (isMenuBarWindow(ev->window))
1756 menubar_control (ev);
1757#endif
1758}
1759 1812
1760void
1761rxvt_term::button_release (XButtonEvent *ev)
1762{
1763 int reportmode = 0;
1764
1765 csrO = 0; /* reset csr Offset */
1766 if (!bypass_keystate)
1767 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1768
1769 if (scrollbar_isUpDn()) {
1770 scrollBar.setIdle ();
1771 scrollbar_show (0);
1772#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1773 refresh_type &= ~SMOOTH_REFRESH;
1774#endif
1775 } 1813 }
1776#ifdef SELECTION_SCROLLING 1814#ifdef SELECTION_SCROLLING
1777 pending_scroll_selection=0; 1815 pending_scroll_selection=0;
1778#endif 1816#endif
1779 if (ev->window == TermWin.vt) 1817 if (ev.window == TermWin.vt)
1780 { 1818 {
1781#ifdef RXVT_GRAPHICS
1782 if (ev->subwindow != None)
1783 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1784 else
1785#endif
1786 {
1787 if (reportmode) 1819 if (reportmode)
1788 { 1820 {
1789 /* mouse report from vt window */ 1821 /* mouse report from vt window */
1790 /* don't report release of wheel "buttons" */ 1822 /* don't report release of wheel "buttons" */
1791 if (ev->button >= 4) 1823 if (ev.button >= 4)
1792 return; 1824 return;
1793#ifdef MOUSE_REPORT_DOUBLECLICK 1825#ifdef MOUSE_REPORT_DOUBLECLICK
1794 /* only report the release of 'slow' single clicks */ 1826 /* only report the release of 'slow' single clicks */
1795 if (MEvent.button != AnyButton 1827 if (MEvent.button != AnyButton
1796 && (ev->button != MEvent.button 1828 && (ev.button != MEvent.button
1797 || (ev->time - MEvent.time 1829 || (ev.time - MEvent.time
1798 > MULTICLICK_TIME / 2))) 1830 > MULTICLICK_TIME / 2)))
1799 { 1831 {
1800 MEvent.clicks = 0; 1832 MEvent.clicks = 0;
1801 MEvent.button = AnyButton; 1833 MEvent.button = AnyButton;
1802 mouse_report (ev); 1834 mouse_report (ev);
1803 } 1835 }
1804#else /* MOUSE_REPORT_DOUBLECLICK */ 1836#else /* MOUSE_REPORT_DOUBLECLICK */
1805 MEvent.button = AnyButton; 1837 MEvent.button = AnyButton;
1806 mouse_report (ev); 1838 mouse_report (ev);
1807#endif /* MOUSE_REPORT_DOUBLECLICK */ 1839#endif /* MOUSE_REPORT_DOUBLECLICK */
1808 return; 1840 return;
1809 } 1841 }
1810 /* 1842 /*
1811 * dumb hack to compensate for the failure of click-and-drag 1843 * dumb hack to compensate for the failure of click-and-drag
1812 * when overriding mouse reporting 1844 * when overriding mouse reporting
1813 */ 1845 */
1814 if (PrivateModes & PrivMode_mouse_report 1846 if (PrivateModes & PrivMode_mouse_report
1815 && bypass_keystate 1847 && bypass_keystate
1816 && ev->button == Button1 && MEvent.clicks <= 1) 1848 && ev.button == Button1 && MEvent.clicks <= 1)
1817 selection_extend (ev->x, ev->y, 0); 1849 selection_extend (ev.x, ev.y, 0);
1818 1850
1819 switch (ev->button) { 1851 switch (ev.button)
1852 {
1820 case Button1: 1853 case Button1:
1821 case Button3: 1854 case Button3:
1822 selection_make (ev->time); 1855 selection_make (ev.time);
1823 break; 1856 break;
1824 case Button2: 1857 case Button2:
1825 selection_request (ev->time, ev->x, ev->y); 1858 selection_request (ev.time, ev.x, ev.y);
1826 break; 1859 break;
1827#ifdef MOUSE_WHEEL 1860#ifdef MOUSE_WHEEL
1828 case Button4: 1861 case Button4:
1829 case Button5: 1862 case Button5:
1830 { 1863 {
1831 int i; 1864 int i;
1832 page_dirn v; 1865 page_dirn v;
1833 1866
1834 v = (ev->button == Button4) ? UP : DN; 1867 v = (ev.button == Button4) ? UP : DN;
1835 if (ev->state & ShiftMask) 1868 if (ev.state & ShiftMask)
1836 i = 1; 1869 i = 1;
1837 else if ((Options & Opt_mouseWheelScrollPage)) 1870 else if ((Options & Opt_mouseWheelScrollPage))
1838 i = TermWin.nrow - 1; 1871 i = TermWin.nrow - 1;
1839 else 1872 else
1840 i = 5; 1873 i = 5;
1841# ifdef MOUSE_SLIP_WHEELING 1874# ifdef MOUSE_SLIP_WHEELING
1842 if (ev->state & ControlMask) 1875 if (ev.state & ControlMask)
1843 { 1876 {
1844 mouse_slip_wheel_speed += (v ? -1 : 1); 1877 mouse_slip_wheel_speed += (v ? -1 : 1);
1845 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1878 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1846 } 1879 }
1847# endif 1880# endif
1848# ifdef JUMP_MOUSE_WHEEL 1881# ifdef JUMP_MOUSE_WHEEL
1849 scr_page (v, i); 1882 scr_page (v, i);
1850 scr_refresh (SMOOTH_REFRESH); 1883 scr_refresh (SMOOTH_REFRESH);
1851 scrollbar_show (1); 1884 scrollbar_show (1);
1852# else 1885# else
1853 while (i--) 1886 while (i--)
1854 { 1887 {
1855 scr_page (v, 1); 1888 scr_page (v, 1);
1856 scr_refresh (SMOOTH_REFRESH); 1889 scr_refresh (SMOOTH_REFRESH);
1857 scrollbar_show (1); 1890 scrollbar_show (1);
1858 } 1891 }
1859# endif 1892# endif
1860 } 1893
1861 break; 1894 }
1895 break;
1862#endif 1896#endif
1863 } 1897
1864 }
1865 } 1898 }
1899 }
1866#ifdef MENUBAR 1900#ifdef MENUBAR
1867 else if (isMenuBarWindow(ev->window)) 1901 else if (isMenuBarWindow (ev.window))
1868 menubar_control (ev); 1902 menubar_control (ev);
1869#endif 1903#endif
1870} 1904}
1871 1905
1872 1906
1873#ifdef TRANSPARENT 1907#ifdef TRANSPARENT
… …
1876 * Do transparency updates if required 1910 * Do transparency updates if required
1877 */ 1911 */
1878int 1912int
1879rxvt_term::check_our_parents () 1913rxvt_term::check_our_parents ()
1880{ 1914{
1881 int i, pchanged, aformat, have_pixmap, rootdepth; 1915 int i, pchanged, aformat, have_pixmap, rootdepth;
1882 unsigned long nitems, bytes_after; 1916 unsigned long nitems, bytes_after;
1883 Atom atype; 1917 Atom atype;
1884 unsigned char *prop = NULL; 1918 unsigned char *prop = NULL;
1885 Window root, oldp, *list; 1919 Window root, oldp, *list;
1886 Pixmap rootpixmap = None; 1920 Pixmap rootpixmap = None;
1887 XWindowAttributes wattr, wrootattr; 1921 XWindowAttributes wattr, wrootattr;
1888 1922
1889 pchanged = 0; 1923 pchanged = 0;
1890 1924
1891 if (!(Options & Opt_transparent)) 1925 if (! (Options & Opt_transparent))
1892 return pchanged; /* Don't try any more */ 1926 return pchanged; /* Don't try any more */
1893 1927
1894 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 1928 XGetWindowAttributes (display->display, display->root, &wrootattr);
1895 rootdepth = wrootattr.depth; 1929 rootdepth = wrootattr.depth;
1896 1930
1897 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 1931 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1898 if (rootdepth != wattr.depth) { 1932 if (rootdepth != wattr.depth)
1933 {
1899 if (am_transparent) { 1934 if (am_transparent)
1935 {
1900 pchanged = 1; 1936 pchanged = 1;
1901 XSetWindowBackground(Xdisplay, TermWin.vt, 1937 XSetWindowBackground (display->display, TermWin.vt,
1902 PixColors[Color_bg]); 1938 PixColors[Color_bg]);
1903 am_transparent = am_pixmap_trans = 0; 1939 am_transparent = am_pixmap_trans = 0;
1904 } 1940 }
1905 return pchanged; /* Don't try any more */ 1941 return pchanged; /* Don't try any more */
1906 } 1942 }
1907 1943
1908/* Get all X ops out of the queue so that our information is up-to-date. */ 1944 /* Get all X ops out of the queue so that our information is up-to-date. */
1909 XSync(Xdisplay, False); 1945 XSync (display->display, False);
1910 1946
1911/* 1947 /*
1912 * Make the frame window set by the window manager have 1948 * Make the frame window set by the window manager have
1913 * the root background. Some window managers put multiple nested frame 1949 * the root background. Some window managers put multiple nested frame
1914 * windows for each client, so we have to take care about that. 1950 * windows for each client, so we have to take care about that.
1915 */ 1951 */
1916 i = (xa[XA_XROOTPMAPID] != 0 1952 i = (xa[XA_XROOTPMAPID] != 0
1917 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 1953 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1918 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1954 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1919 &nitems, &bytes_after, &prop) == Success)); 1955 &nitems, &bytes_after, &prop) == Success));
1920 if (!i || prop == NULL) 1956 if (!i || prop == NULL)
1921 have_pixmap = 0; 1957 have_pixmap = 0;
1922 else { 1958 else
1959 {
1923 have_pixmap = 1; 1960 have_pixmap = 1;
1924 rootpixmap = *((Pixmap *)prop); 1961 rootpixmap = * ((Pixmap *)prop);
1925 XFree(prop); 1962 XFree (prop);
1926 } 1963 }
1927 if (have_pixmap) { 1964 if (have_pixmap)
1928/* 1965 {
1966 /*
1929 * Copy Xroot pixmap transparency 1967 * Copy display->root pixmap transparency
1930 */ 1968 */
1931 int sx, sy, nx, ny; 1969 int sx, sy, nx, ny;
1932 unsigned int nw, nh; 1970 unsigned int nw, nh;
1933 Window cr; 1971 Window cr;
1934 XImage *image; 1972 XImage *image;
1935 GC gc; 1973 GC gc;
1936 XGCValues gcvalue; 1974 XGCValues gcvalue;
1937 1975
1938 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 1976 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1939 0, 0, &sx, &sy, &cr); 1977 0, 0, &sx, &sy, &cr);
1940 nw = (unsigned int)szHint.width; 1978 nw = (unsigned int)szHint.width;
1941 nh = (unsigned int)szHint.height; 1979 nh = (unsigned int)szHint.height;
1942 nx = ny = 0; 1980 nx = ny = 0;
1943 if (sx < 0) { 1981 if (sx < 0)
1982 {
1944 nw += sx; 1983 nw += sx;
1945 nx = -sx; 1984 nx = -sx;
1946 sx = 0; 1985 sx = 0;
1947 } 1986 }
1948 if (sy < 0) { 1987 if (sy < 0)
1988 {
1949 nh += sy; 1989 nh += sy;
1950 ny = -sy; 1990 ny = -sy;
1951 sy = 0; 1991 sy = 0;
1952 } 1992 }
1953 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1993 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1954 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1994 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1955 allowedxerror = -1; 1995 allowedxerror = -1;
1956 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1996 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1957 ZPixmap); 1997 ZPixmap);
1958 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1998 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1959 /* XXX: may need a delay here? */ 1999 /* XXX: may need a delay here? */
1960 allowedxerror = 0; 2000 allowedxerror = 0;
1961 if (image == NULL) { 2001 if (image == NULL)
2002 {
1962 if (am_transparent && am_pixmap_trans) { 2003 if (am_transparent && am_pixmap_trans)
1963 pchanged = 1; 2004 {
2005 pchanged = 1;
1964 if (TermWin.pixmap != None) { 2006 if (TermWin.pixmap != None)
2007 {
1965 XFreePixmap(Xdisplay, TermWin.pixmap); 2008 XFreePixmap (display->display, TermWin.pixmap);
1966 TermWin.pixmap = None; 2009 TermWin.pixmap = None;
1967 } 2010 }
1968 } 2011 }
1969 am_pixmap_trans = 0; 2012 am_pixmap_trans = 0;
1970 } else { 2013 }
2014 else
2015 {
1971 if (TermWin.pixmap != None) 2016 if (TermWin.pixmap != None)
1972 XFreePixmap(Xdisplay, TermWin.pixmap); 2017 XFreePixmap (display->display, TermWin.pixmap);
1973 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 2018 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1974 (unsigned int)szHint.width, 2019 (unsigned int)szHint.width,
1975 (unsigned int)szHint.height, 2020 (unsigned int)szHint.height,
1976 (unsigned int)image->depth); 2021 (unsigned int)image->depth);
1977 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 2022 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1978 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 2023 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1979 nx, ny, (unsigned int)image->width, 2024 nx, ny, (unsigned int)image->width,
1980 (unsigned int)image->height); 2025 (unsigned int)image->height);
1981 XFreeGC(Xdisplay, gc); 2026 XFreeGC (display->display, gc);
1982 XDestroyImage(image); 2027 XDestroyImage (image);
1983 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2028 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1984 TermWin.pixmap); 2029 TermWin.pixmap);
1985 if (!am_transparent || !am_pixmap_trans) 2030 if (!am_transparent || !am_pixmap_trans)
1986 pchanged = 1; 2031 pchanged = 1;
1987 am_transparent = am_pixmap_trans = 1; 2032 am_transparent = am_pixmap_trans = 1;
1988 } 2033 }
1989 } 2034 }
1990 if (!am_pixmap_trans) { 2035 if (!am_pixmap_trans)
2036 {
1991 unsigned int n; 2037 unsigned int n;
1992/* 2038 /*
1993 * InheritPixmap transparency 2039 * InheritPixmap transparency
1994 */ 2040 */
1995 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2041 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1996 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2042 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
1997 i++) { 2043 i++)
2044 {
1998 oldp = TermWin.parent[i]; 2045 oldp = TermWin.parent[i];
1999 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2046 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2000 &TermWin.parent[i], &list, &n); 2047 &TermWin.parent[i], &list, &n);
2001 XFree(list); 2048 XFree (list);
2002 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2049 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2003 if (TermWin.parent[i] == Xroot) { 2050 if (TermWin.parent[i] == display->root)
2004 if (oldp != None) 2051 {
2005 pchanged = 1; 2052 if (oldp != None)
2006 break; 2053 pchanged = 1;
2007 } 2054 break;
2055 }
2008 if (oldp != TermWin.parent[i]) 2056 if (oldp != TermWin.parent[i])
2009 pchanged = 1; 2057 pchanged = 1;
2010 } 2058 }
2011 n = 0; 2059 n = 0;
2012 if (pchanged) { 2060 if (pchanged)
2061 {
2013 for (; n < (unsigned int)i; n++) { 2062 for (; n < (unsigned int)i; n++)
2063 {
2014 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2064 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2015 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2065 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2016 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2066 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2067 {
2017 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2068 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2018 break; 2069 break;
2019 } 2070 }
2020 } 2071 }
2021 } 2072 }
2022 if (n > (int)(sizeof(TermWin.parent) 2073 if (n > (int) (sizeof (TermWin.parent)
2023 / sizeof(TermWin.parent[0]))) { 2074 / sizeof (TermWin.parent[0])))
2075 {
2024 D_X((stderr, "InheritPixmap Turning off")); 2076 D_X ((stderr, "InheritPixmap Turning off"));
2025 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2077 XSetWindowBackground (display->display, TermWin.parent[0],
2026 PixColors[Color_fg]); 2078 PixColors[Color_fg]);
2027 XSetWindowBackground(Xdisplay, TermWin.vt, 2079 XSetWindowBackground (display->display, TermWin.vt,
2028 PixColors[Color_bg]); 2080 PixColors[Color_bg]);
2029 am_transparent = 0; 2081 am_transparent = 0;
2030 /* XXX: also turn off Opt_transparent? */ 2082 /* XXX: also turn off Opt_transparent? */
2031 } else { 2083 }
2084 else
2085 {
2032 /* wait (an arbitrary period) for the WM to do its thing 2086 /* wait (an arbitrary period) for the WM to do its thing
2033 * needed for fvwm2.2.2 (and before?) */ 2087 * needed for fvwm2.2.2 (and before?) */
2034# ifdef HAVE_NANOSLEEP 2088# ifdef HAVE_NANOSLEEP
2035 struct timespec rqt; 2089 struct timespec rqt;
2036 2090
2037 rqt.tv_sec = 1; 2091 rqt.tv_sec = 1;
2038 rqt.tv_nsec = 0; 2092 rqt.tv_nsec = 0;
2039 nanosleep(&rqt, NULL); 2093 nanosleep (&rqt, NULL);
2040# else 2094# else
2041 sleep(1); 2095 sleep (1);
2042# endif 2096# endif
2043 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2097 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2044 for (n = 0; n < (unsigned int)i; n++) 2098 for (n = 0; n < (unsigned int)i; n++)
2045 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2099 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2046 ParentRelative); 2100 ParentRelative);
2047 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2101 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2048 ParentRelative); 2102 ParentRelative);
2049 am_transparent = 1; 2103 am_transparent = 1;
2050 } 2104 }
2051 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2105 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2052 TermWin.parent[i] = None; 2106 TermWin.parent[i] = None;
2053 } 2107 }
2054 return pchanged; 2108 return pchanged;
2055} 2109}
2056#endif 2110#endif
2057 2111
2058/*}}} */ 2112/*}}} */
2059 2113
… …
2061/*----------------------------------------------------------------------*/ 2115/*----------------------------------------------------------------------*/
2062#ifdef PRINTPIPE 2116#ifdef PRINTPIPE
2063FILE * 2117FILE *
2064rxvt_term::popen_printer () 2118rxvt_term::popen_printer ()
2065{ 2119{
2066 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2120 FILE *stream = popen (rs[Rs_print_pipe], "w");
2067 2121
2068 if (stream == NULL) 2122 if (stream == NULL)
2069 rxvt_print_error("can't open printer pipe"); 2123 rxvt_print_error ("can't open printer pipe");
2070 return stream; 2124 return stream;
2071} 2125}
2072 2126
2073int 2127int
2074rxvt_term::pclose_printer (FILE *stream) 2128rxvt_term::pclose_printer (FILE *stream)
2075{ 2129{
2076 fflush (stream); 2130 fflush (stream);
2077/* pclose() reported not to work on SunOS 4.1.3 */ 2131 /* pclose () reported not to work on SunOS 4.1.3 */
2078# if defined (__sun__) /* TODO: RESOLVE THIS */ 2132# if defined (__sun__) /* TODO: RESOLVE THIS */
2079/* pclose works provided SIGCHLD handler uses waitpid */ 2133 /* pclose works provided SIGCHLD handler uses waitpid */
2080 return pclose (stream); /* return fclose (stream); */ 2134 return pclose (stream); /* return fclose (stream); */
2081# else 2135# else
2082 return pclose (stream); 2136 return pclose (stream);
2083# endif 2137# endif
2084} 2138}
… …
2087 * simulate attached vt100 printer 2141 * simulate attached vt100 printer
2088 */ 2142 */
2089void 2143void
2090rxvt_term::process_print_pipe () 2144rxvt_term::process_print_pipe ()
2091{ 2145{
2092 int done; 2146 int done;
2093 FILE *fd; 2147 FILE *fd;
2094 2148
2095 if ((fd = popen_printer ()) == NULL) 2149 if ((fd = popen_printer ()) == NULL)
2096 return; 2150 return;
2097 2151
2098/* 2152 /*
2099 * Send all input to the printer until either ESC[4i or ESC[?4i 2153 * Send all input to the printer until either ESC[4i or ESC[?4i
2100 * is received. 2154 * is received.
2101 */ 2155 */
2102 for (done = 0; !done;) { 2156 for (done = 0; !done;)
2157 {
2103 unsigned char buf[8]; 2158 unsigned char buf[8];
2104 unsigned char ch; 2159 unsigned char ch;
2105 unsigned int i, len; 2160 unsigned int i, len;
2106 2161
2107 if ((ch = cmd_getc ()) != C0_ESC) { 2162 if ((ch = cmd_getc ()) != C0_ESC)
2163 {
2108 if (putc(ch, fd) == EOF) 2164 if (putc (ch, fd) == EOF)
2109 break; /* done = 1 */ 2165 break; /* done = 1 */
2110 } else { 2166 }
2167 else
2168 {
2111 len = 0; 2169 len = 0;
2112 buf[len++] = ch; 2170 buf[len++] = ch;
2113 2171
2114 if ((buf[len++] = cmd_getc ()) == '[') { 2172 if ((buf[len++] = cmd_getc ()) == '[')
2173 {
2115 if ((ch = cmd_getc ()) == '?') { 2174 if ((ch = cmd_getc ()) == '?')
2116 buf[len++] = '?'; 2175 {
2117 ch = cmd_getc (); 2176 buf[len++] = '?';
2118 } 2177 ch = cmd_getc ();
2178 }
2119 if ((buf[len++] = ch) == '4') { 2179 if ((buf[len++] = ch) == '4')
2180 {
2120 if ((buf[len++] = cmd_getc ()) == 'i') 2181 if ((buf[len++] = cmd_getc ()) == 'i')
2121 break; /* done = 1 */ 2182 break; /* done = 1 */
2122 } 2183 }
2184 }
2185 for (i = 0; i < len; i++)
2186 if (putc (buf[i], fd) == EOF)
2187 {
2188 done = 1;
2189 break;
2190 }
2191 }
2123 } 2192 }
2124 for (i = 0; i < len; i++)
2125 if (putc(buf[i], fd) == EOF) {
2126 done = 1;
2127 break;
2128 }
2129 }
2130 }
2131 pclose_printer (fd); 2193 pclose_printer (fd);
2132} 2194}
2133#endif /* PRINTPIPE */ 2195#endif /* PRINTPIPE */
2134/*}}} */ 2196/*}}} */
2135 2197
2136/* *INDENT-OFF* */ 2198/* *INDENT-OFF* */
2137enum { 2199enum {
2138 C1_40 = 0x40, 2200 C1_40 = 0x40,
2139 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2201 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2140 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2202 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2141 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2203 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2142 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2204 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2143}; 2205};
2144/* *INDENT-ON* */ 2206/* *INDENT-ON* */
2145 2207
2146/*{{{ process non-printing single characters */ 2208/*{{{ process non-printing single characters */
2147void 2209void
2148rxvt_term::process_nonprinting (unsigned char ch) 2210rxvt_term::process_nonprinting (unsigned char ch)
2149{ 2211{
2150 switch (ch) { 2212 switch (ch)
2213 {
2151 case C0_ENQ: /* terminal Status */ 2214 case C0_ENQ: /* terminal Status */
2152 if (rs[Rs_answerbackstring]) 2215 if (rs[Rs_answerbackstring])
2153 tt_write( 2216 tt_write (
2154 (const unsigned char *)rs[Rs_answerbackstring], 2217 (const unsigned char *)rs[Rs_answerbackstring],
2155 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2218 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2156 else 2219 else
2157 tt_write((unsigned char *)VT100_ANS, 2220 tt_write ((unsigned char *)VT100_ANS,
2158 (unsigned int)STRLEN(VT100_ANS)); 2221 (unsigned int)STRLEN (VT100_ANS));
2159 break; 2222 break;
2160 case C0_BEL: /* bell */ 2223 case C0_BEL: /* bell */
2161 scr_bell (); 2224 scr_bell ();
2162 break; 2225 break;
2163 case C0_BS: /* backspace */ 2226 case C0_BS: /* backspace */
2164 scr_backspace (); 2227 scr_backspace ();
2165 break; 2228 break;
2166 case C0_HT: /* tab */ 2229 case C0_HT: /* tab */
2167 scr_tab (1); 2230 scr_tab (1);
2168 break; 2231 break;
2169 case C0_CR: /* carriage return */ 2232 case C0_CR: /* carriage return */
2170 scr_gotorc (0, 0, R_RELATIVE); 2233 scr_gotorc (0, 0, R_RELATIVE);
2171 break; 2234 break;
2172 case C0_VT: /* vertical tab, form feed */ 2235 case C0_VT: /* vertical tab, form feed */
2173 case C0_FF: 2236 case C0_FF:
2174 case C0_LF: /* line feed */ 2237 case C0_LF: /* line feed */
2175 scr_index (UP); 2238 scr_index (UP);
2176 break; 2239 break;
2177 case C0_SO: /* shift out - acs */ 2240 case C0_SO: /* shift out - acs */
2178 scr_charset_choose (1); 2241 scr_charset_choose (1);
2179 break; 2242 break;
2180 case C0_SI: /* shift in - acs */ 2243 case C0_SI: /* shift in - acs */
2181 scr_charset_choose (0); 2244 scr_charset_choose (0);
2182 break; 2245 break;
2183 } 2246 }
2184} 2247}
2185/*}}} */ 2248/*}}} */
2186 2249
2187 2250
2188/*{{{ process VT52 escape sequences */ 2251/*{{{ process VT52 escape sequences */
2189void 2252void
2190rxvt_term::process_escape_vt52 (unsigned char ch) 2253rxvt_term::process_escape_vt52 (unsigned char ch)
2191{ 2254{
2192 int row, col; 2255 int row, col;
2256
2257 switch (ch)
2193 2258 {
2194 switch (ch) {
2195 case 'A': /* cursor up */ 2259 case 'A': /* cursor up */
2196 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE); 2260 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2197 break; 2261 break;
2198 case 'B': /* cursor down */ 2262 case 'B': /* cursor down */
2199 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE); 2263 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2200 break; 2264 break;
2201 case 'C': /* cursor right */ 2265 case 'C': /* cursor right */
2202 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 2266 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2203 break; 2267 break;
2204 case 'D': /* cursor left */ 2268 case 'D': /* cursor left */
2205 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 2269 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2206 break; 2270 break;
2207 case 'H': /* cursor home */ 2271 case 'H': /* cursor home */
2208 scr_gotorc (0, 0, 0); 2272 scr_gotorc (0, 0, 0);
2209 break; 2273 break;
2210 case 'I': /* cursor up and scroll down if needed */ 2274 case 'I': /* cursor up and scroll down if needed */
2211 scr_index (DN); 2275 scr_index (DN);
2212 break; 2276 break;
2213 case 'J': /* erase to end of screen */ 2277 case 'J': /* erase to end of screen */
2214 scr_erase_screen (0); 2278 scr_erase_screen (0);
2215 break; 2279 break;
2216 case 'K': /* erase to end of line */ 2280 case 'K': /* erase to end of line */
2217 scr_erase_line (0); 2281 scr_erase_line (0);
2218 break; 2282 break;
2219 case 'Y': /* move to specified row and col */ 2283 case 'Y': /* move to specified row and col */
2220 /* full command is 'ESC Y row col' where row and col 2284 /* full command is 'ESC Y row col' where row and col
2221 * are encoded by adding 32 and sending the ascii 2285 * are encoded by adding 32 and sending the ascii
2222 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2286 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2223 * etc. */ 2287 * etc. */
2224 row = cmd_getc () - ' '; 2288 row = cmd_getc () - ' ';
2225 col = cmd_getc () - ' '; 2289 col = cmd_getc () - ' ';
2226 scr_gotorc (row, col, 0); 2290 scr_gotorc (row, col, 0);
2227 break; 2291 break;
2228 case 'Z': /* identify the terminal type */ 2292 case 'Z': /* identify the terminal type */
2229 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2293 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2230 break; 2294 break;
2231 case '<': /* turn off VT52 mode */ 2295 case '<': /* turn off VT52 mode */
2232 PrivMode(0, PrivMode_vt52); 2296 PrivMode (0, PrivMode_vt52);
2233 break; 2297 break;
2234 case 'F': /* use special graphics character set */ 2298 case 'F': /* use special graphics character set */
2235 case 'G': /* use regular character set */ 2299 case 'G': /* use regular character set */
2236 /* unimplemented */ 2300 /* unimplemented */
2237 break; 2301 break;
2238 case '=': /* use alternate keypad mode */ 2302 case '=': /* use alternate keypad mode */
2239 case '>': /* use regular keypad mode */ 2303 case '>': /* use regular keypad mode */
2240 /* unimplemented */ 2304 /* unimplemented */
2241 break; 2305 break;
2242 } 2306 }
2243} 2307}
2244/*}}} */ 2308/*}}} */
2245 2309
2246 2310
2247/*{{{ process escape sequences */ 2311/*{{{ process escape sequences */
2248void 2312void
2249rxvt_term::process_escape_seq () 2313rxvt_term::process_escape_seq ()
2250{ 2314{
2251 unsigned char ch = cmd_getc (); 2315 unsigned char ch = cmd_getc ();
2252 2316
2253 if (PrivateModes & PrivMode_vt52) { 2317 if (PrivateModes & PrivMode_vt52)
2254 process_escape_vt52 (ch);
2255 return;
2256 }
2257 2318 {
2319 process_escape_vt52 (ch);
2320 return;
2321 }
2322
2258 switch (ch) { 2323 switch (ch)
2324 {
2259 /* case 1: do_tek_mode (); break; */ 2325 /* case 1: do_tek_mode (); break; */
2260 case '#': 2326 case '#':
2261 if (cmd_getc () == '8') 2327 if (cmd_getc () == '8')
2262 scr_E (); 2328 scr_E ();
2263 break; 2329 break;
2264 case '(': 2330 case '(':
2265 scr_charset_set (0, (unsigned int)cmd_getc ()); 2331 scr_charset_set (0, (unsigned int)cmd_getc ());
2266 break; 2332 break;
2267 case ')': 2333 case ')':
2268 scr_charset_set (1, (unsigned int)cmd_getc ()); 2334 scr_charset_set (1, (unsigned int)cmd_getc ());
2269 break; 2335 break;
2270 case '*': 2336 case '*':
2271 scr_charset_set (2, (unsigned int)cmd_getc ()); 2337 scr_charset_set (2, (unsigned int)cmd_getc ());
2272 break; 2338 break;
2273 case '+': 2339 case '+':
2274 scr_charset_set (3, (unsigned int)cmd_getc ()); 2340 scr_charset_set (3, (unsigned int)cmd_getc ());
2275 break; 2341 break;
2276#ifdef MULTICHAR_SET 2342#ifdef MULTICHAR_SET
2277 case '$': 2343 case '$':
2278 scr_charset_set (-2, (unsigned int)cmd_getc ()); 2344 scr_charset_set (-2, (unsigned int)cmd_getc ());
2279 break; 2345 break;
2280#endif 2346#endif
2281#ifndef NO_FRILLS 2347#ifndef NO_FRILLS
2282 case '6': 2348 case '6':
2283 scr_backindex (); 2349 scr_backindex ();
2284 break; 2350 break;
2285#endif 2351#endif
2286 case '7': 2352 case '7':
2287 scr_cursor (SAVE); 2353 scr_cursor (SAVE);
2288 break; 2354 break;
2289 case '8': 2355 case '8':
2290 scr_cursor (RESTORE); 2356 scr_cursor (RESTORE);
2291 break; 2357 break;
2292#ifndef NO_FRILLS 2358#ifndef NO_FRILLS
2293 case '9': 2359 case '9':
2294 scr_forwardindex (); 2360 scr_forwardindex ();
2295 break; 2361 break;
2296#endif 2362#endif
2297 case '=': 2363 case '=':
2298 case '>': 2364 case '>':
2299 PrivMode((ch == '='), PrivMode_aplKP); 2365 PrivMode ((ch == '='), PrivMode_aplKP);
2300 break; 2366 break;
2301 2367
2302 case C1_40: 2368 case C1_40:
2303 cmd_getc (); 2369 cmd_getc ();
2304 break; 2370 break;
2305 case C1_44: 2371 case C1_44:
2306 scr_index (UP); 2372 scr_index (UP);
2307 break; 2373 break;
2308 2374
2309 /* 8.3.87: NEXT LINE */ 2375 /* 8.3.87: NEXT LINE */
2310 case C1_NEL: /* ESC E */ 2376 case C1_NEL: /* ESC E */
2311 { 2377 {
2312 uint32_t nlcr[] = { '\n', '\r' }; 2378 uint32_t nlcr[] = { '\n', '\r' };
2313 scr_add_lines (nlcr, 1, 2); 2379 scr_add_lines (nlcr, 1, 2);
2314 } 2380 }
2315 break; 2381 break;
2316 2382
2317 /* kidnapped escape sequence: Should be 8.3.48 */ 2383 /* kidnapped escape sequence: Should be 8.3.48 */
2318 case C1_ESA: /* ESC G */ 2384 case C1_ESA: /* ESC G */
2319 process_graphics (); 2385 process_graphics ();
2320 break; 2386 break;
2321 2387
2322 /* 8.3.63: CHARACTER TABULATION SET */ 2388 /* 8.3.63: CHARACTER TABULATION SET */
2323 case C1_HTS: /* ESC H */ 2389 case C1_HTS: /* ESC H */
2324 scr_set_tab (1); 2390 scr_set_tab (1);
2325 break; 2391 break;
2326 2392
2327 /* 8.3.105: REVERSE LINE FEED */ 2393 /* 8.3.105: REVERSE LINE FEED */
2328 case C1_RI: /* ESC M */ 2394 case C1_RI: /* ESC M */
2329 scr_index (DN); 2395 scr_index (DN);
2330 break; 2396 break;
2331 2397
2332 /* 8.3.142: SINGLE-SHIFT TWO */ 2398 /* 8.3.142: SINGLE-SHIFT TWO */
2333 /*case C1_SS2: scr_single_shift (2); break; */ 2399 /*case C1_SS2: scr_single_shift (2); break; */
2334 2400
2335 /* 8.3.143: SINGLE-SHIFT THREE */ 2401 /* 8.3.143: SINGLE-SHIFT THREE */
2336 /*case C1_SS3: scr_single_shift (3); break; */ 2402 /*case C1_SS3: scr_single_shift (3); break; */
2337 2403
2338 /* 8.3.27: DEVICE CONTROL STRING */ 2404 /* 8.3.27: DEVICE CONTROL STRING */
2339 case C1_DCS: /* ESC P */ 2405 case C1_DCS: /* ESC P */
2340 process_dcs_seq (); 2406 process_dcs_seq ();
2341 break; 2407 break;
2342 2408
2343 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2409 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2344 case C1_SCI: /* ESC Z */ 2410 case C1_SCI: /* ESC Z */
2345 tt_write((const unsigned char *)ESCZ_ANSWER, 2411 tt_write ((const unsigned char *)ESCZ_ANSWER,
2346 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2412 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2347 break; /* steal obsolete ESC [ c */ 2413 break; /* steal obsolete ESC [ c */
2348 2414
2349 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2415 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2350 case C1_CSI: /* ESC [ */ 2416 case C1_CSI: /* ESC [ */
2351 process_csi_seq (); 2417 process_csi_seq ();
2352 break; 2418 break;
2353 2419
2354 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2420 /* 8.3.90: OPERATING SYSTEM COMMAND */
2355 case C1_OSC: /* ESC ] */ 2421 case C1_OSC: /* ESC ] */
2356 process_osc_seq (); 2422 process_osc_seq ();
2357 break; 2423 break;
2358 2424
2359 /* 8.3.106: RESET TO INITIAL STATE */ 2425 /* 8.3.106: RESET TO INITIAL STATE */
2360 case 'c': 2426 case 'c':
2361 scr_poweron (); 2427 scr_poweron ();
2362 scrollbar_show (1); 2428 scrollbar_show (1);
2363 break; 2429 break;
2364 2430
2365 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2431 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2366 case 'n': 2432 case 'n':
2367 scr_charset_choose (2); 2433 scr_charset_choose (2);
2368 break; 2434 break;
2369 2435
2370 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2436 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2371 case 'o': 2437 case 'o':
2372 scr_charset_choose (3); 2438 scr_charset_choose (3);
2373 break; 2439 break;
2374 } 2440 }
2375} 2441}
2376/*}}} */ 2442/*}}} */
2377 2443
2378/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2444/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2379/* *INDENT-OFF* */ 2445/* *INDENT-OFF* */
2380enum { 2446enum {
2381 CSI_ICH = 0x40, 2447 CSI_ICH = 0x40,
2382 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2448 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2383 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2449 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2384 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2450 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2385 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2451 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2386 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2452 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2387 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2453 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2388 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2454 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2389 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2455 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2390}; 2456};
2391 2457
2392#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2458#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2393 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2459 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2394 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2460 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2395#define get_byte_array_bit(array, bit) \ 2461#define get_byte_array_bit(array, bit) \
2396 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2462 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2397 2463
2398const unsigned char csi_defaults[] = { 2464const unsigned char csi_defaults[] =
2465 {
2399 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2466 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2400 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2467 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2401 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2468 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2402 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2469 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2403 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2470 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2404 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2471 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2405 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2472 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2406 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2473 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2407}; 2474 };
2408/* *INDENT-ON* */ 2475/* *INDENT-ON* */
2409 2476
2410void 2477void
2411rxvt_term::process_csi_seq () 2478rxvt_term::process_csi_seq ()
2412{ 2479{
2413 unsigned char ch, priv, i; 2480 unsigned char ch, priv, i;
2414 unsigned int nargs, p; 2481 unsigned int nargs, p;
2415 int n, ndef; 2482 int n, ndef;
2416 int arg[ESC_ARGS]; 2483 int arg[ESC_ARGS];
2417 2484
2418 for (nargs = ESC_ARGS; nargs > 0;) 2485 for (nargs = ESC_ARGS; nargs > 0;)
2419 arg[--nargs] = 0; 2486 arg[--nargs] = 0;
2420 2487
2421 priv = 0; 2488 priv = 0;
2489 ch = cmd_getc ();
2490 if (ch >= '<' && ch <= '?')
2491 { /* '<' '=' '>' '?' */
2492 priv = ch;
2422 ch = cmd_getc (); 2493 ch = cmd_getc ();
2423 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2424 priv = ch;
2425 ch = cmd_getc ();
2426 } 2494 }
2427/* read any numerical arguments */ 2495 /* read any numerical arguments */
2428 for (n = -1; ch < CSI_ICH; ) { 2496 for (n = -1; ch < CSI_ICH; )
2497 {
2429 if (isdigit(ch)) { 2498 if (isdigit (ch))
2499 {
2430 if (n < 0) 2500 if (n < 0)
2431 n = ch - '0'; 2501 n = ch - '0';
2432 else 2502 else
2433 n = n * 10 + ch - '0'; 2503 n = n * 10 + ch - '0';
2504 }
2434 } else if (ch == ';') { 2505 else if (ch == ';')
2506 {
2435 if (nargs < ESC_ARGS) 2507 if (nargs < ESC_ARGS)
2436 arg[nargs++] = n; 2508 arg[nargs++] = n;
2437 n = -1; 2509 n = -1;
2510 }
2438 } else if (ch == '\b') { 2511 else if (ch == '\b')
2512 {
2439 scr_backspace (); 2513 scr_backspace ();
2514 }
2440 } else if (ch == C0_ESC) { 2515 else if (ch == C0_ESC)
2516 {
2441 process_escape_seq (); 2517 process_escape_seq ();
2518 return;
2519 }
2520 else if (ch < ' ')
2521 {
2522 process_nonprinting (ch);
2523 }
2524 ch = cmd_getc ();
2525 }
2526
2527 if (ch > CSI_7F)
2442 return; 2528 return;
2443 } else if (ch < ' ') {
2444 process_nonprinting (ch);
2445 }
2446 ch = cmd_getc ();
2447 }
2448 2529
2449 if (ch > CSI_7F)
2450 return;
2451
2452 if (nargs < ESC_ARGS) 2530 if (nargs < ESC_ARGS)
2453 arg[nargs++] = n; 2531 arg[nargs++] = n;
2454 2532
2455 i = ch - CSI_ICH; 2533 i = ch - CSI_ICH;
2456 ndef = get_byte_array_bit(csi_defaults, i); 2534 ndef = get_byte_array_bit (csi_defaults, i);
2457 for (p = 0; p < nargs; p++) 2535 for (p = 0; p < nargs; p++)
2458 if (arg[p] == -1) 2536 if (arg[p] == -1)
2459 arg[p] = ndef; 2537 arg[p] = ndef;
2460 2538
2461#ifdef DEBUG_CMD 2539#ifdef DEBUG_CMD
2462 fprintf(stderr, "CSI "); 2540 fprintf (stderr, "CSI ");
2463 for (p = 0; p < nargs; p++) 2541 for (p = 0; p < nargs; p++)
2464 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2542 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2465 fprintf(stderr, "%c\n", ch); 2543 fprintf (stderr, "%c\n", ch);
2466#endif 2544#endif
2467 2545
2468/* 2546 /*
2469 * private mode handling 2547 * private mode handling
2470 */ 2548 */
2471 if (priv) { 2549 if (priv)
2472 switch (priv) { 2550 {
2473 case '>': 2551 switch (priv)
2552 {
2553 case '>':
2474 if (ch == CSI_DA) /* secondary device attributes */ 2554 if (ch == CSI_DA) /* secondary device attributes */
2475 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2555 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2476 break; 2556 break;
2477 case '?': 2557 case '?':
2478 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2558 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2479 process_terminal_mode (ch, priv, nargs, arg); 2559 process_terminal_mode (ch, priv, nargs, arg);
2480 break; 2560 break;
2481 } 2561 }
2482 return; 2562 return;
2483 } 2563 }
2484 2564
2485 switch (ch) { 2565 switch (ch)
2486/* 2566 {
2567 /*
2487 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2568 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2488 */ 2569 */
2489#ifdef PRINTPIPE 2570#ifdef PRINTPIPE
2490 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2571 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2491 switch (arg[0]) { 2572 switch (arg[0])
2573 {
2492 case 0: /* initiate transfer to primary aux device */ 2574 case 0: /* initiate transfer to primary aux device */
2493 scr_printscreen (0); 2575 scr_printscreen (0);
2494 break; 2576 break;
2495 case 5: /* start relay to primary aux device */ 2577 case 5: /* start relay to primary aux device */
2496 process_print_pipe (); 2578 process_print_pipe ();
2579 break;
2580 }
2497 break; 2581 break;
2498 }
2499 break;
2500#endif 2582#endif
2501 2583
2502 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2584 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2503 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2585 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2504 arg[0] = -arg[0]; 2586 arg[0] = -arg[0];
2505 /* FALLTHROUGH */ 2587 /* FALLTHROUGH */
2506 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2588 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2507 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2589 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2508 scr_gotorc (arg[0], 0, RELATIVE); 2590 scr_gotorc (arg[0], 0, RELATIVE);
2509 break; 2591 break;
2510 2592
2511 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2593 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2512 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2594 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2513#ifdef ISO6429 2595#ifdef ISO6429
2514 arg[0] = -arg[0]; 2596 arg[0] = -arg[0];
2515#else /* emulate common DEC VTs */ 2597#else /* emulate common DEC VTs */
2516 arg[0] = arg[0] ? -arg[0] : -1; 2598 arg[0] = arg[0] ? -arg[0] : -1;
2517#endif 2599#endif
2518 /* FALLTHROUGH */ 2600 /* FALLTHROUGH */
2519 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2601 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2520 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2602 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2521#ifdef ISO6429 2603#ifdef ISO6429
2522 scr_gotorc (0, arg[0], RELATIVE); 2604 scr_gotorc (0, arg[0], RELATIVE);
2523#else /* emulate common DEC VTs */ 2605#else /* emulate common DEC VTs */
2524 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE); 2606 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2525#endif 2607#endif
2526 break; 2608 break;
2527 2609
2528 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2610 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2529 arg[0] = -arg[0]; 2611 arg[0] = -arg[0];
2530 /* FALLTHROUGH */ 2612 /* FALLTHROUGH */
2531 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2613 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2532 scr_gotorc (arg[0], 0, R_RELATIVE); 2614 scr_gotorc (arg[0], 0, R_RELATIVE);
2533 break; 2615 break;
2534 2616
2535 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2617 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2536 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2618 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2537 scr_gotorc (0, arg[0] - 1, R_RELATIVE); 2619 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2538 break; 2620 break;
2539 2621
2540 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2622 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2541 scr_gotorc (arg[0] - 1, 0, C_RELATIVE); 2623 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2542 break; 2624 break;
2543 2625
2544 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2626 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2545 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2627 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2546 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2628 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2547 break; 2629 break;
2548 2630
2549 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2631 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2550 arg[0] = -arg[0]; 2632 arg[0] = -arg[0];
2551 /* FALLTHROUGH */ 2633 /* FALLTHROUGH */
2552 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2634 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2553 scr_tab (arg[0]); 2635 scr_tab (arg[0]);
2554 break; 2636 break;
2555 2637
2556 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2638 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2557 scr_erase_screen (arg[0]); 2639 scr_erase_screen (arg[0]);
2558 break; 2640 break;
2559 2641
2560 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2642 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2561 scr_erase_line (arg[0]); 2643 scr_erase_line (arg[0]);
2562 break; 2644 break;
2563 2645
2564 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2646 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2565 scr_insdel_chars (arg[0], INSERT); 2647 scr_insdel_chars (arg[0], INSERT);
2566 break; 2648 break;
2567 2649
2568 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2650 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2569 scr_insdel_lines (arg[0], INSERT); 2651 scr_insdel_lines (arg[0], INSERT);
2570 break; 2652 break;
2571 2653
2572 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2654 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2573 scr_insdel_lines (arg[0], DELETE); 2655 scr_insdel_lines (arg[0], DELETE);
2574 break; 2656 break;
2575 2657
2576 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2658 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2577 scr_insdel_chars (arg[0], ERASE); 2659 scr_insdel_chars (arg[0], ERASE);
2578 break; 2660 break;
2579 2661
2580 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2662 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2581 scr_insdel_chars (arg[0], DELETE); 2663 scr_insdel_chars (arg[0], DELETE);
2582 break; 2664 break;
2583 2665
2584 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2666 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2585 arg[0] = -arg[0]; 2667 arg[0] = -arg[0];
2586 /* FALLTHROUGH */ 2668 /* FALLTHROUGH */
2587 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2669 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2588 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2670 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2589 break; 2671 break;
2590 2672
2591 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2673 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2592 tt_write((const unsigned char *)VT100_ANS, 2674 tt_write ((const unsigned char *)VT100_ANS,
2593 (unsigned int)(sizeof(VT100_ANS) - 1)); 2675 (unsigned int) (sizeof (VT100_ANS) - 1));
2594 break; 2676 break;
2595 2677
2596 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2678 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2597 process_sgr_mode (nargs, arg); 2679 process_sgr_mode (nargs, arg);
2598 break; 2680 break;
2599 2681
2600 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2682 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2601 switch (arg[0]) { 2683 switch (arg[0])
2684 {
2602 case 5: /* DSR requested */ 2685 case 5: /* DSR requested */
2603 tt_printf("\033[0n"); 2686 tt_printf ("\033[0n");
2604 break; 2687 break;
2605 case 6: /* CPR requested */ 2688 case 6: /* CPR requested */
2606 scr_report_position (); 2689 scr_report_position ();
2607 break; 2690 break;
2608#if defined (ENABLE_DISPLAY_ANSWER) 2691#if defined (ENABLE_DISPLAY_ANSWER)
2609 case 7: /* unofficial extension */ 2692 case 7: /* unofficial extension */
2610 tt_printf("%-.250s\n", rs[Rs_display_name]); 2693 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2611 break; 2694 break;
2612#endif 2695#endif
2613 case 8: /* unofficial extension */ 2696 case 8: /* unofficial extension */
2614 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2697 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2698 break;
2699 }
2615 break; 2700 break;
2616 }
2617 break;
2618 2701
2619 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2702 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2620 switch (arg[0]) { 2703 switch (arg[0])
2704 {
2621 case 0: /* char tab stop cleared at active position */ 2705 case 0: /* char tab stop cleared at active position */
2622 scr_set_tab (0); 2706 scr_set_tab (0);
2623 break; 2707 break;
2624 /* case 1: */ /* line tab stop cleared in active line */ 2708 /* case 1: */ /* line tab stop cleared in active line */
2625 /* case 2: */ /* char tab stops cleared in active line */ 2709 /* case 2: */ /* char tab stops cleared in active line */
2626 case 3: /* all char tab stops are cleared */ 2710 case 3: /* all char tab stops are cleared */
2627 /* case 4: */ /* all line tab stops are cleared */ 2711 /* case 4: */ /* all line tab stops are cleared */
2628 case 5: /* all tab stops are cleared */ 2712 case 5: /* all tab stops are cleared */
2629 scr_set_tab (-1); 2713 scr_set_tab (-1);
2714 break;
2715 }
2630 break; 2716 break;
2631 }
2632 break;
2633 2717
2634 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2718 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2635 switch (arg[0]) { 2719 switch (arg[0])
2720 {
2636 case 0: /* char tab stop set at active position */ 2721 case 0: /* char tab stop set at active position */
2637 scr_set_tab (1); 2722 scr_set_tab (1);
2638 break; /* = ESC H */ 2723 break; /* = ESC H */
2639 /* case 1: */ /* line tab stop set at active line */ 2724 /* case 1: */ /* line tab stop set at active line */
2640 case 2: /* char tab stop cleared at active position */ 2725 case 2: /* char tab stop cleared at active position */
2641 scr_set_tab (0); 2726 scr_set_tab (0);
2642 break; /* = ESC [ 0 g */ 2727 break; /* = ESC [ 0 g */
2643 /* case 3: */ /* line tab stop cleared at active line */ 2728 /* case 3: */ /* line tab stop cleared at active line */
2644 /* case 4: */ /* char tab stops cleared at active line */ 2729 /* case 4: */ /* char tab stops cleared at active line */
2645 case 5: /* all char tab stops are cleared */ 2730 case 5: /* all char tab stops are cleared */
2646 scr_set_tab (-1); 2731 scr_set_tab (-1);
2647 break; /* = ESC [ 3 g */ 2732 break; /* = ESC [ 3 g */
2648 /* case 6: */ /* all line tab stops are cleared */ 2733 /* case 6: */ /* all line tab stops are cleared */
2649 } 2734 }
2650 break; 2735 break;
2651 2736
2652 case CSI_RM: /* 8.3.107: RESET MODE */ 2737 case CSI_RM: /* 8.3.107: RESET MODE */
2653 if (arg[0] == 4) 2738 if (arg[0] == 4)
2654 scr_insert_mode (0); 2739 scr_insert_mode (0);
2655 break; 2740 break;
2656 2741
2657 case CSI_SM: /* 8.3.126: SET MODE */ 2742 case CSI_SM: /* 8.3.126: SET MODE */
2658 if (arg[0] == 4) 2743 if (arg[0] == 4)
2659 scr_insert_mode (1); 2744 scr_insert_mode (1);
2660 break; 2745 break;
2661 2746
2662/* 2747 /*
2663 * PRIVATE USE beyond this point. All CSI_7? sequences here 2748 * PRIVATE USE beyond this point. All CSI_7? sequences here
2664 */ 2749 */
2665 case CSI_72: /* DECSTBM: set top and bottom margins */ 2750 case CSI_72: /* DECSTBM: set top and bottom margins */
2666 if (nargs == 1) 2751 if (nargs == 1)
2667 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1); 2752 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2668 else if (nargs == 0 || arg[0] >= arg[1]) 2753 else if (nargs == 0 || arg[0] >= arg[1])
2669 scr_scroll_region (0, MAX_ROWS - 1); 2754 scr_scroll_region (0, MAX_ROWS - 1);
2670 else 2755 else
2671 scr_scroll_region (arg[0] - 1, arg[1] - 1); 2756 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2672 break; 2757 break;
2673 2758
2674 case CSI_73: 2759 case CSI_73:
2675 scr_cursor (SAVE); 2760 scr_cursor (SAVE);
2676 break; 2761 break;
2677 case CSI_75: 2762 case CSI_75:
2678 scr_cursor (RESTORE); 2763 scr_cursor (RESTORE);
2679 break; 2764 break;
2680 2765
2681#ifndef NO_FRILLS 2766#ifndef NO_FRILLS
2682 case CSI_74: 2767 case CSI_74:
2683 process_window_ops (arg, nargs); 2768 process_window_ops (arg, nargs);
2684 break; 2769 break;
2685#endif 2770#endif
2686 2771
2687 case CSI_78: /* DECREQTPARM */ 2772 case CSI_78: /* DECREQTPARM */
2688 if (arg[0] == 0 || arg[0] == 1) 2773 if (arg[0] == 0 || arg[0] == 1)
2689 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2774 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2690 /* FALLTHROUGH */ 2775 /* FALLTHROUGH */
2691 2776
2692 default: 2777 default:
2693 break; 2778 break;
2694 } 2779 }
2695} 2780}
2696/*}}} */ 2781/*}}} */
2697 2782
2698#ifndef NO_FRILLS 2783#ifndef NO_FRILLS
2699/* ARGSUSED */ 2784/* ARGSUSED */
2700void 2785void
2701rxvt_term::process_window_ops (const int *args, unsigned int nargs) 2786rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2702{ 2787{
2703 int x, y; 2788 int x, y;
2704#if 0 2789#if 0
2705 char *s; 2790 char *s;
2706#endif 2791#endif
2707 XWindowAttributes wattr; 2792 XWindowAttributes wattr;
2708 Window wdummy; 2793 Window wdummy;
2709 2794
2710 if (nargs == 0) 2795 if (nargs == 0)
2711 return; 2796 return;
2712 switch (args[0]) { 2797 switch (args[0])
2798 {
2713 /* 2799 /*
2714 * commands 2800 * commands
2715 */ 2801 */
2716 case 1: /* deiconify window */ 2802 case 1: /* deiconify window */
2717 XMapWindow(Xdisplay, TermWin.parent[0]); 2803 XMapWindow (display->display, TermWin.parent[0]);
2718 break; 2804 break;
2719 case 2: /* iconify window */ 2805 case 2: /* iconify window */
2720 XIconifyWindow(Xdisplay, TermWin.parent[0], 2806 XIconifyWindow (display->display, TermWin.parent[0],
2721 DefaultScreen(Xdisplay)); 2807 DefaultScreen (display->display));
2722 break; 2808 break;
2723 case 3: /* set position (pixels) */ 2809 case 3: /* set position (pixels) */
2724 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 2810 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2725 break; 2811 break;
2726 case 4: /* set size (pixels) */ 2812 case 4: /* set size (pixels) */
2727 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2813 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2728 break; 2814 break;
2729 case 5: /* raise window */ 2815 case 5: /* raise window */
2730 XRaiseWindow(Xdisplay, TermWin.parent[0]); 2816 XRaiseWindow (display->display, TermWin.parent[0]);
2731 break; 2817 break;
2732 case 6: /* lower window */ 2818 case 6: /* lower window */
2733 XLowerWindow(Xdisplay, TermWin.parent[0]); 2819 XLowerWindow (display->display, TermWin.parent[0]);
2734 break; 2820 break;
2735 case 7: /* refresh window */ 2821 case 7: /* refresh window */
2736 scr_touch (true); 2822 scr_touch (true);
2737 break; 2823 break;
2738 case 8: /* set size (chars) */ 2824 case 8: /* set size (chars) */
2739 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2825 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2740 (unsigned int)(args[1] * TermWin.fheight)); 2826 (unsigned int) (args[1] * TermWin.fheight));
2741 break; 2827 break;
2742 default: 2828 default:
2743 if (args[0] >= 24) /* set height (chars) */ 2829 if (args[0] >= 24) /* set height (chars) */
2744 set_widthheight ((unsigned int)TermWin.width, 2830 set_widthheight ((unsigned int)TermWin.width,
2745 (unsigned int)(args[1] * TermWin.fheight)); 2831 (unsigned int) (args[1] * TermWin.fheight));
2746 break; 2832 break;
2747 /* 2833 /*
2748 * reports - some output format copied from XTerm 2834 * reports - some output format copied from XTerm
2749 */ 2835 */
2750 case 11: /* report window state */ 2836 case 11: /* report window state */
2751 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2837 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2752 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2838 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2753 break; 2839 break;
2754 case 13: /* report window position */ 2840 case 13: /* report window position */
2755 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2841 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2756 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 2842 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2757 -wattr.border_width, -wattr.border_width, 2843 -wattr.border_width, -wattr.border_width,
2758 &x, &y, &wdummy); 2844 &x, &y, &wdummy);
2759 tt_printf("\033[3;%d;%dt", x, y); 2845 tt_printf ("\033[3;%d;%dt", x, y);
2760 break; 2846 break;
2761 case 14: /* report window size (pixels) */ 2847 case 14: /* report window size (pixels) */
2762 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2763 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2849 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2764 break; 2850 break;
2765 case 18: /* report window size (chars) */ 2851 case 18: /* report window size (chars) */
2766 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2852 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2767 break; 2853 break;
2768#if 0 /* XXX: currently disabled due to security concerns */ 2854#if 0 /* XXX: currently disabled due to security concerns */
2769 case 20: /* report icon label */ 2855 case 20: /* report icon label */
2770 XGetIconName(Xdisplay, TermWin.parent[0], &s); 2856 XGetIconName (display->display, TermWin.parent[0], &s);
2771 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2857 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2772 break; 2858 break;
2773 case 21: /* report window title */ 2859 case 21: /* report window title */
2774 XFetchName(Xdisplay, TermWin.parent[0], &s); 2860 XFetchName (display->display, TermWin.parent[0], &s);
2775 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2861 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2776 break; 2862 break;
2777#endif 2863#endif
2864
2778 } 2865 }
2779} 2866}
2780#endif 2867#endif
2781 2868
2782/*----------------------------------------------------------------------*/ 2869/*----------------------------------------------------------------------*/
2783/* 2870/*
2784 * get input up until STRING TERMINATOR (or BEL) 2871 * get input up until STRING TERMINATOR (or BEL)
2785 * ends_how is terminator used. returned input must be free()d 2872 * ends_how is terminator used. returned input must be free ()d
2786 */ 2873 */
2787unsigned char * 2874unsigned char *
2788rxvt_term::get_to_st (unsigned char *ends_how) 2875rxvt_term::get_to_st (unsigned char *ends_how)
2789{ 2876{
2790 int seen_esc = 0; /* seen escape? */ 2877 int seen_esc = 0; /* seen escape? */
2791 unsigned int n = 0; 2878 unsigned int n = 0;
2792 unsigned char *s; 2879 unsigned char *s;
2793 unsigned char ch, string[STRING_MAX]; 2880 unsigned char ch, string[STRING_MAX];
2794 2881
2795 for (; (ch = cmd_getc ());) { 2882 for (; (ch = cmd_getc ());)
2883 {
2796 if (ch == C0_BEL 2884 if (ch == C0_BEL
2797 || ch == CHAR_ST 2885 || ch == CHAR_ST
2798 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2886 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2799 break; 2887 break;
2800 if (ch == C0_ESC) { 2888 if (ch == C0_ESC)
2889 {
2801 seen_esc = 1; 2890 seen_esc = 1;
2802 continue; 2891 continue;
2892 }
2803 } else if (ch == '\t') 2893 else if (ch == '\t')
2804 ch = ' '; /* translate '\t' to space */ 2894 ch = ' '; /* translate '\t' to space */
2805 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2895 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2806 return NULL; /* other control character - exit */ 2896 return NULL; /* other control character - exit */
2807 if (n < sizeof(string) - 1) 2897 if (n < sizeof (string) - 1)
2808 string[n++] = ch; 2898 string[n++] = ch;
2809 seen_esc = 0; 2899 seen_esc = 0;
2810 } 2900 }
2811 string[n++] = '\0'; 2901 string[n++] = '\0';
2812 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2902 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2813 return NULL; 2903 return NULL;
2814 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2904 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2815 STRNCPY(s, string, n); 2905 STRNCPY (s, string, n);
2816 return s; 2906 return s;
2817} 2907}
2818 2908
2819/*----------------------------------------------------------------------*/ 2909/*----------------------------------------------------------------------*/
2820/* 2910/*
2821 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2911 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2822 */ 2912 */
2823void 2913void
2824rxvt_term::process_dcs_seq () 2914rxvt_term::process_dcs_seq ()
2825{ 2915{
2826 unsigned char eh, *s; 2916 unsigned char eh, *s;
2827/* 2917 /*
2828 * Not handled yet 2918 * Not handled yet
2829 */ 2919 */
2830 s = get_to_st (&eh); 2920 s = get_to_st (&eh);
2831 if (s) 2921 if (s)
2832 free(s); 2922 free (s);
2833 return; 2923 return;
2834} 2924}
2835 2925
2836/*----------------------------------------------------------------------*/ 2926/*----------------------------------------------------------------------*/
2837/* 2927/*
2838 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2928 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2839 */ 2929 */
2840void 2930void
2841rxvt_term::process_osc_seq () 2931rxvt_term::process_osc_seq ()
2842{ 2932{
2843 unsigned char ch, eh, *s; 2933 unsigned char ch, eh, *s;
2844 int arg; 2934 int arg;
2845 2935
2846 ch = cmd_getc (); 2936 ch = cmd_getc ();
2847 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2937 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2848 arg = arg * 10 + (ch - '0'); 2938 arg = arg * 10 + (ch - '0');
2849 2939
2850 if (ch == ';') { 2940 if (ch == ';')
2941 {
2851 s = get_to_st (&eh); 2942 s = get_to_st (&eh);
2852 if (s) { 2943 if (s)
2853 /* 2944 {
2945 /*
2854 * rxvt_menubar_dispatch() violates the constness of the string, 2946 * rxvt_menubar_dispatch () violates the constness of the string,
2855 * so do it here 2947 * so do it here
2856 */ 2948 */
2857 if (arg == XTerm_Menu) 2949 if (arg == XTerm_Menu)
2858#if 0 /* XXX: currently disabled due to security concerns */ 2950#if 0 /* XXX: currently disabled due to security concerns */
2859 menubar_dispatch ((char *)s); 2951 menubar_dispatch ((char *)s);
2860#else 2952#else
2861 (void)0; 2953 (void)0;
2862#endif 2954#endif
2863 else 2955 else
2864 xterm_seq (arg, (char *)s, eh); 2956 xterm_seq (arg, (char *)s, eh);
2865 free(s); 2957 free (s);
2866 } 2958 }
2867 } 2959 }
2868} 2960}
2869/* 2961/*
2870 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2962 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2871 * 0 = change iconName/title 2963 * 0 = change iconName/title
… …
2886 * 39 = change default fg color 2978 * 39 = change default fg color
2887 * 49 = change default bg color 2979 * 49 = change default bg color
2888 * 55 = dump scrollback buffer and all of screen 2980 * 55 = dump scrollback buffer and all of screen
2889 */ 2981 */
2890void 2982void
2891rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 2983rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
2892{ 2984{
2893 int changed = 0; 2985 int changed = 0;
2894 int color; 2986 int color;
2895 char *buf, *name; 2987 char *buf, *name;
2896 2988
2897 assert(str != NULL); 2989 assert (str != NULL);
2898 switch (op) { 2990 switch (op)
2991 {
2899 case XTerm_name: 2992 case XTerm_name:
2900 set_title (str); 2993 set_title (str);
2901 /* FALLTHROUGH */ 2994 /* FALLTHROUGH */
2902 case XTerm_iconName: 2995 case XTerm_iconName:
2903 set_iconName (str); 2996 set_iconName (str);
2904 break; 2997 break;
2905 case XTerm_title: 2998 case XTerm_title:
2906 set_title (str); 2999 set_title (str);
2907 break; 3000 break;
2908 case XTerm_Color: 3001 case XTerm_Color:
2909 for (buf = (char *)str; buf && *buf;) { 3002 for (buf = (char *)str; buf && *buf;)
3003 {
2910 if ((name = STRCHR(buf, ';')) == NULL) 3004 if ((name = STRCHR (buf, ';')) == NULL)
2911 break; 3005 break;
2912 *name++ = '\0'; 3006 *name++ = '\0';
2913 color = atoi(buf); 3007 color = atoi (buf);
2914 if (color < 0 || color >= TOTAL_COLORS) 3008 if (color < 0 || color >= TOTAL_COLORS)
2915 break; 3009 break;
2916 if ((buf = STRCHR(name, ';')) != NULL) 3010 if ((buf = STRCHR (name, ';')) != NULL)
2917 *buf++ = '\0'; 3011 *buf++ = '\0';
2918 set_window_color (color + minCOLOR, name); 3012 set_window_color (color + minCOLOR, name);
2919 } 3013 }
2920 break; 3014 break;
2921#ifndef NO_CURSORCOLOR 3015#ifndef NO_CURSORCOLOR
2922 case XTerm_Color_cursor: 3016 case XTerm_Color_cursor:
2923 set_window_color (Color_cursor, str); 3017 set_window_color (Color_cursor, str);
2924 break; 3018 break;
2925#endif 3019#endif
2926 case XTerm_Color_pointer: 3020 case XTerm_Color_pointer:
2927 set_window_color (Color_pointer, str); 3021 set_window_color (Color_pointer, str);
2928 break; 3022 break;
2929#ifndef NO_BOLD_UNDERLINE_REVERSE 3023#ifndef NO_BOLD_UNDERLINE_REVERSE
2930 case XTerm_Color_BD: 3024 case XTerm_Color_BD:
2931 set_window_color (Color_BD, str); 3025 set_window_color (Color_BD, str);
2932 break; 3026 break;
2933 case XTerm_Color_UL: 3027 case XTerm_Color_UL:
2934 set_window_color (Color_UL, str); 3028 set_window_color (Color_UL, str);
2935 break; 3029 break;
2936 case XTerm_Color_RV: 3030 case XTerm_Color_RV:
2937 set_window_color (Color_RV, str); 3031 set_window_color (Color_RV, str);
2938 break; 3032 break;
2939#endif 3033#endif
2940 3034
2941 case XTerm_Menu: 3035 case XTerm_Menu:
2942 /* 3036 /*
2943 * rxvt_menubar_dispatch() violates the constness of the string, 3037 * rxvt_menubar_dispatch () violates the constness of the string,
2944 * so DON'T do it here 3038 * so DON'T do it here
2945 */ 3039 */
2946 break; 3040 break;
2947 case XTerm_Pixmap: 3041 case XTerm_Pixmap:
2948 if (*str != ';') { 3042 if (*str != ';')
3043 {
2949#if XPM_BACKGROUND 3044#if XPM_BACKGROUND
2950 scale_pixmap (""); /* reset to default scaling */ 3045 scale_pixmap (""); /* reset to default scaling */
2951 set_bgPixmap (str); /* change pixmap */ 3046 set_bgPixmap (str); /* change pixmap */
2952#endif 3047#endif
2953 scr_touch (true); 3048 scr_touch (true);
2954 } 3049 }
2955 while ((str = STRCHR(str, ';')) != NULL) { 3050 while ((str = STRCHR (str, ';')) != NULL)
2956 str++; 3051 {
3052 str++;
2957#if XPM_BACKGROUND 3053#if XPM_BACKGROUND
2958 changed += scale_pixmap (str); 3054 changed += scale_pixmap (str);
2959#endif 3055#endif
2960 } 3056
2961 if (changed) { 3057 }
3058 if (changed)
3059 {
2962#ifdef XPM_BACKGROUND 3060#ifdef XPM_BACKGROUND
2963 resize_pixmap (); 3061 resize_pixmap ();
2964#endif 3062#endif
2965 scr_touch (true); 3063 scr_touch (true);
2966 } 3064 }
2967 break; 3065 break;
2968 3066
2969 case XTerm_restoreFG: 3067 case XTerm_restoreFG:
2970 set_window_color (Color_fg, str); 3068 set_window_color (Color_fg, str);
2971 break; 3069 break;
2972 case XTerm_restoreBG: 3070 case XTerm_restoreBG:
2973 set_window_color (Color_bg, str); 3071 set_window_color (Color_bg, str);
2974 break; 3072 break;
2975 case XTerm_logfile: 3073 case XTerm_logfile:
2976 break; 3074 break;
2977 case XTerm_font: 3075 case XTerm_font:
2978 change_font (0, str); 3076 change_font (0, str);
2979 break; 3077 break;
2980#if 0 3078#if 0
2981 case XTerm_dumpscreen: /* no error notices */ 3079 case XTerm_dumpscreen: /* no error notices */
2982 { 3080 {
2983 int fd; 3081 int fd;
2984 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3082 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
2985 scr_dump (fd); 3083 {
2986 close(fd); 3084 scr_dump (fd);
2987 } 3085 close (fd);
2988 } 3086 }
2989 break; 3087 }
3088 break;
2990#endif 3089#endif
3090
2991 } 3091 }
2992} 3092}
2993/*----------------------------------------------------------------------*/ 3093/*----------------------------------------------------------------------*/
2994 3094
2995/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3095/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3003 * so no need for fancy checking 3103 * so no need for fancy checking
3004 */ 3104 */
3005int 3105int
3006rxvt_term::privcases (int mode, unsigned long bit) 3106rxvt_term::privcases (int mode, unsigned long bit)
3007{ 3107{
3008 int state; 3108 int state;
3009 3109
3010 if (mode == 's') { 3110 if (mode == 's')
3111 {
3011 SavedModes |= (PrivateModes & bit); 3112 SavedModes |= (PrivateModes & bit);
3012 return -1; 3113 return -1;
3013 } else { 3114 }
3115 else
3116 {
3014 if (mode == 'r') 3117 if (mode == 'r')
3015 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3118 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3016 else 3119 else
3017 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3120 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3018 PrivMode(state, bit); 3121 PrivMode (state, bit);
3019 } 3122 }
3020 return state; 3123 return state;
3021} 3124}
3022 3125
3023/* we're not using priv _yet_ */ 3126/* we're not using priv _yet_ */
3024void 3127void
3025rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3128rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3026{ 3129{
3027 unsigned int i, j; 3130 unsigned int i, j;
3028 int state; 3131 int state;
3029 static const struct { 3132 static const struct
3133 {
3030 const int argval; 3134 const int argval;
3031 const unsigned long bit; 3135 const unsigned long bit;
3136 }
3032 } argtopriv[] = { 3137 argtopriv[] = {
3033 { 1, PrivMode_aplCUR }, 3138 { 1, PrivMode_aplCUR },
3034 { 2, PrivMode_vt52 }, 3139 { 2, PrivMode_vt52 },
3035 { 3, PrivMode_132 }, 3140 { 3, PrivMode_132 },
3036 { 4, PrivMode_smoothScroll }, 3141 { 4, PrivMode_smoothScroll },
3037 { 5, PrivMode_rVideo }, 3142 { 5, PrivMode_rVideo },
3038 { 6, PrivMode_relOrigin }, 3143 { 6, PrivMode_relOrigin },
3039 { 7, PrivMode_Autowrap }, 3144 { 7, PrivMode_Autowrap },
3040 { 9, PrivMode_MouseX10 }, 3145 { 9, PrivMode_MouseX10 },
3041#ifdef menuBar_esc 3146#ifdef menuBar_esc
3042 { menuBar_esc, PrivMode_menuBar }, 3147 { menuBar_esc, PrivMode_menuBar },
3043#endif 3148#endif
3044#ifdef scrollBar_esc 3149#ifdef scrollBar_esc
3045 { scrollBar_esc, PrivMode_scrollBar }, 3150 { scrollBar_esc, PrivMode_scrollBar },
3046#endif 3151#endif
3047 { 25, PrivMode_VisibleCursor }, 3152 { 25, PrivMode_VisibleCursor },
3048 { 35, PrivMode_ShiftKeys }, 3153 { 35, PrivMode_ShiftKeys },
3049 { 40, PrivMode_132OK }, 3154 { 40, PrivMode_132OK },
3050 { 47, PrivMode_Screen }, 3155 { 47, PrivMode_Screen },
3051 { 66, PrivMode_aplKP }, 3156 { 66, PrivMode_aplKP },
3052#ifndef NO_BACKSPACE_KEY 3157#ifndef NO_BACKSPACE_KEY
3053 { 67, PrivMode_BackSpace }, 3158 { 67, PrivMode_BackSpace },
3054#endif 3159#endif
3055 { 1000, PrivMode_MouseX11 }, 3160 { 1000, PrivMode_MouseX11 },
3056 { 1010, PrivMode_TtyOutputInh }, 3161 { 1010, PrivMode_TtyOutputInh },
3057 { 1011, PrivMode_Keypress }, 3162 { 1011, PrivMode_Keypress },
3058 { 1047, PrivMode_Screen }, 3163 { 1047, PrivMode_Screen },
3059 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3164 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3060 }; 3165 };
3061 3166
3062 if (nargs == 0) 3167 if (nargs == 0)
3063 return; 3168 return;
3064 3169
3065/* make lo/hi boolean */ 3170 /* make lo/hi boolean */
3066 if (mode == 'l') 3171 if (mode == 'l')
3067 mode = 0; /* reset */ 3172 mode = 0; /* reset */
3068 else if (mode == 'h') 3173 else if (mode == 'h')
3069 mode = 1; /* set */ 3174 mode = 1; /* set */
3070 3175
3071 for (i = 0; i < nargs; i++) { 3176 for (i = 0; i < nargs; i++)
3177 {
3072 state = -1; 3178 state = -1;
3073 3179
3074 /* basic handling */ 3180 /* basic handling */
3075 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3181 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3076 if (argtopriv[j].argval == arg[i]) { 3182 if (argtopriv[j].argval == arg[i])
3183 {
3077 state = privcases (mode, argtopriv[j].bit); 3184 state = privcases (mode, argtopriv[j].bit);
3078 break; 3185 break;
3079 } 3186 }
3080 3187
3081 /* extra handling for values with state unkept */ 3188 /* extra handling for values with state unkept */
3082 if (state == -1) 3189 if (state == -1)
3083 switch (arg[i]) { 3190 switch (arg[i])
3191 {
3084 case 1048: /* alternative cursor save */ 3192 case 1048: /* alternative cursor save */
3085 if (mode == 0) 3193 if (mode == 0)
3086 scr_cursor (RESTORE); 3194 scr_cursor (RESTORE);
3087 else if (mode == 1) 3195 else if (mode == 1)
3088 scr_cursor (SAVE); 3196 scr_cursor (SAVE);
3089 /* FALLTHROUGH */ 3197 /* FALLTHROUGH */
3090 default: 3198 default:
3091 continue; /* for(;i;) */ 3199 continue; /* for (;i;) */
3092 } 3200 }
3093 3201
3094 /* extra handling for values with valid 0 or 1 state */ 3202 /* extra handling for values with valid 0 or 1 state */
3095 switch (arg[i]) { 3203 switch (arg[i])
3204 {
3096 /* case 1: - application cursor keys */ 3205 /* case 1: - application cursor keys */
3097 case 2: /* VT52 mode */ 3206 case 2: /* VT52 mode */
3098 /* oddball mode. should be set regardless of set/reset 3207 /* oddball mode. should be set regardless of set/reset
3099 * parameter. Return from VT52 mode with an ESC < from 3208 * parameter. Return from VT52 mode with an ESC < from
3100 * within VT52 mode 3209 * within VT52 mode
3101 */ 3210 */
3102 PrivMode(1, PrivMode_vt52); 3211 PrivMode (1, PrivMode_vt52);
3103 break; 3212 break;
3104 case 3: /* 80/132 */ 3213 case 3: /* 80/132 */
3105 if (PrivateModes & PrivMode_132OK) 3214 if (PrivateModes & PrivMode_132OK)
3106 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3215 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3107 (unsigned int)TermWin.height); 3216 (unsigned int)TermWin.height);
3108 break; 3217 break;
3109 case 4: /* smooth scrolling */ 3218 case 4: /* smooth scrolling */
3110 if (state) 3219 if (state)
3111 Options &= ~Opt_jumpScroll; 3220 Options &= ~Opt_jumpScroll;
3112 else 3221 else
3113 Options |= Opt_jumpScroll; 3222 Options |= Opt_jumpScroll;
3114 break; 3223 break;
3115 case 5: /* reverse video */ 3224 case 5: /* reverse video */
3116 scr_rvideo_mode (state); 3225 scr_rvideo_mode (state);
3117 break; 3226 break;
3118 case 6: /* relative/absolute origins */ 3227 case 6: /* relative/absolute origins */
3119 scr_relative_origin (state); 3228 scr_relative_origin (state);
3120 break; 3229 break;
3121 case 7: /* autowrap */ 3230 case 7: /* autowrap */
3122 scr_autowrap (state); 3231 scr_autowrap (state);
3123 break; 3232 break;
3124 /* case 8: - auto repeat, can't do on a per window basis */ 3233 /* case 8: - auto repeat, can't do on a per window basis */
3125 case 9: /* X10 mouse reporting */ 3234 case 9: /* X10 mouse reporting */
3126 if (state) /* orthogonal */ 3235 if (state) /* orthogonal */
3127 PrivateModes &= ~(PrivMode_MouseX11); 3236 PrivateModes &= ~ (PrivMode_MouseX11);
3128 break; 3237 break;
3129#ifdef menuBar_esc 3238#ifdef menuBar_esc
3130 case menuBar_esc: 3239 case menuBar_esc:
3131#ifdef MENUBAR 3240#ifdef MENUBAR
3132 map_menuBar (state); 3241 map_menuBar (state);
3133#endif 3242#endif
3134 break; 3243 break;
3135#endif 3244#endif
3136#ifdef scrollBar_esc 3245#ifdef scrollBar_esc
3137 case scrollBar_esc: 3246 case scrollBar_esc:
3138 if (scrollbar_mapping (state)) { 3247 if (scrollbar_mapping (state))
3248 {
3139 resize_all_windows (0, 0, 0); 3249 resize_all_windows (0, 0, 0);
3140 scr_touch (true); 3250 scr_touch (true);
3141 } 3251 }
3142 break; 3252 break;
3143#endif 3253#endif
3144 case 25: /* visible/invisible cursor */ 3254 case 25: /* visible/invisible cursor */
3145 scr_cursor_visible (state); 3255 scr_cursor_visible (state);
3146 break; 3256 break;
3147 /* case 35: - shift keys */ 3257 /* case 35: - shift keys */
3148 /* case 40: - 80 <--> 132 mode */ 3258 /* case 40: - 80 <--> 132 mode */
3149 case 47: /* secondary screen */ 3259 case 47: /* secondary screen */
3150 scr_change_screen (state); 3260 scr_change_screen (state);
3151 break; 3261 break;
3152 /* case 66: - application key pad */ 3262 /* case 66: - application key pad */
3153 /* case 67: - backspace key */ 3263 /* case 67: - backspace key */
3154 case 1000: /* X11 mouse reporting */ 3264 case 1000: /* X11 mouse reporting */
3155 if (state) /* orthogonal */ 3265 if (state) /* orthogonal */
3156 PrivateModes &= ~(PrivMode_MouseX10); 3266 PrivateModes &= ~ (PrivMode_MouseX10);
3157 break; 3267 break;
3158#if 0 3268#if 0
3159 case 1001: 3269 case 1001:
3160 break; /* X11 mouse highlighting */ 3270 break; /* X11 mouse highlighting */
3161#endif 3271#endif
3162 case 1010: /* scroll to bottom on TTY output inhibit */ 3272 case 1010: /* scroll to bottom on TTY output inhibit */
3163 if (state) 3273 if (state)
3164 Options &= ~Opt_scrollTtyOutput; 3274 Options &= ~Opt_scrollTtyOutput;
3165 else 3275 else
3166 Options |= Opt_scrollTtyOutput; 3276 Options |= Opt_scrollTtyOutput;
3167 break; 3277 break;
3168 case 1011: /* scroll to bottom on key press */ 3278 case 1011: /* scroll to bottom on key press */
3169 if (state) 3279 if (state)
3170 Options |= Opt_scrollTtyKeypress; 3280 Options |= Opt_scrollTtyKeypress;
3171 else 3281 else
3172 Options &= ~Opt_scrollTtyKeypress; 3282 Options &= ~Opt_scrollTtyKeypress;
3173 break; 3283 break;
3174 case 1047: /* secondary screen w/ clearing */ 3284 case 1047: /* secondary screen w/ clearing */
3175 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3285 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3176 if (current_screen != PRIMARY) 3286 if (current_screen != PRIMARY)
3177 scr_erase_screen (2); 3287 scr_erase_screen (2);
3178 scr_change_screen (state); 3288 scr_change_screen (state);
3179 /* FALLTHROUGH */ 3289 /* FALLTHROUGH */
3180 default: 3290 default:
3181 break; 3291 break;
3182 } 3292 }
3183 } 3293 }
3184} 3294}
3185/*}}} */ 3295/*}}} */
3186 3296
3187/*{{{ process sgr sequences */ 3297/*{{{ process sgr sequences */
3188void 3298void
3189rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3299rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3190{ 3300{
3191 unsigned int i; 3301 unsigned int i;
3192 short rendset; 3302 short rendset;
3193 int rendstyle; 3303 int rendstyle;
3194 3304
3195 if (nargs == 0) { 3305 if (nargs == 0)
3306 {
3196 scr_rendition (0, ~RS_None); 3307 scr_rendition (0, ~RS_None);
3197 return; 3308 return;
3198 } 3309 }
3199 for (i = 0; i < nargs; i++) { 3310 for (i = 0; i < nargs; i++)
3311 {
3200 rendset = -1; 3312 rendset = -1;
3201 switch (arg[i]) { 3313 switch (arg[i])
3202 case 0: 3314 {
3315 case 0:
3203 rendset = 0, rendstyle = ~RS_None; 3316 rendset = 0, rendstyle = ~RS_None;
3204 break; 3317 break;
3205 case 1: 3318 case 1:
3206 rendset = 1, rendstyle = RS_Bold; 3319 rendset = 1, rendstyle = RS_Bold;
3207 break; 3320 break;
3208 case 4: 3321 case 4:
3209 rendset = 1, rendstyle = RS_Uline; 3322 rendset = 1, rendstyle = RS_Uline;
3210 break; 3323 break;
3211 case 5: 3324 case 5:
3212 rendset = 1, rendstyle = RS_Blink; 3325 rendset = 1, rendstyle = RS_Blink;
3213 break; 3326 break;
3214 case 7: 3327 case 7:
3215 rendset = 1, rendstyle = RS_RVid; 3328 rendset = 1, rendstyle = RS_RVid;
3216 break; 3329 break;
3217 case 22: 3330 case 22:
3218 rendset = 0, rendstyle = RS_Bold; 3331 rendset = 0, rendstyle = RS_Bold;
3219 break; 3332 break;
3220 case 24: 3333 case 24:
3221 rendset = 0, rendstyle = RS_Uline; 3334 rendset = 0, rendstyle = RS_Uline;
3222 break; 3335 break;
3223 case 25: 3336 case 25:
3224 rendset = 0, rendstyle = RS_Blink; 3337 rendset = 0, rendstyle = RS_Blink;
3225 break; 3338 break;
3226 case 27: 3339 case 27:
3227 rendset = 0, rendstyle = RS_RVid; 3340 rendset = 0, rendstyle = RS_RVid;
3228 break; 3341 break;
3229 } 3342 }
3230 if (rendset != -1) { 3343 if (rendset != -1)
3344 {
3231 scr_rendition (rendset, rendstyle); 3345 scr_rendition (rendset, rendstyle);
3232 continue; /* for(;i;) */ 3346 continue; /* for (;i;) */
3233 } 3347 }
3234 3348
3235 switch (arg[i]) { 3349 switch (arg[i])
3236 case 30: 3350 {
3351 case 30:
3237 case 31: /* set fg color */ 3352 case 31: /* set fg color */
3238 case 32: 3353 case 32:
3239 case 33: 3354 case 33:
3240 case 34: 3355 case 34:
3241 case 35: 3356 case 35:
3242 case 36: 3357 case 36:
3243 case 37: 3358 case 37:
3244 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3359 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3245 Color_fg); 3360 Color_fg);
3246 break; 3361 break;
3247#ifdef TTY_256COLOR 3362#ifdef TTY_256COLOR
3248 case 38: 3363 case 38:
3249 if (nargs > i + 2 && arg[i + 1] == 5) { 3364 if (nargs > i + 2 && arg[i + 1] == 5)
3365 {
3250 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3366 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3251 Color_fg); 3367 Color_fg);
3252 i += 2; 3368 i += 2;
3253 } 3369 }
3254 break; 3370 break;
3255#endif 3371#endif
3256 case 39: /* default fg */ 3372 case 39: /* default fg */
3257 scr_color (Color_fg, Color_fg); 3373 scr_color (Color_fg, Color_fg);
3258 break; 3374 break;
3259 3375
3260 case 40: 3376 case 40:
3261 case 41: /* set bg color */ 3377 case 41: /* set bg color */
3262 case 42: 3378 case 42:
3263 case 43: 3379 case 43:
3264 case 44: 3380 case 44:
3265 case 45: 3381 case 45:
3266 case 46: 3382 case 46:
3267 case 47: 3383 case 47:
3268 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3384 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3269 Color_bg); 3385 Color_bg);
3270 break; 3386 break;
3271#ifdef TTY_256COLOR 3387#ifdef TTY_256COLOR
3272 case 48: 3388 case 48:
3273 if (nargs > i + 2 && arg[i + 1] == 5) { 3389 if (nargs > i + 2 && arg[i + 1] == 5)
3390 {
3274 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3391 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3275 Color_bg); 3392 Color_bg);
3276 i += 2; 3393 i += 2;
3277 } 3394 }
3278 break; 3395 break;
3279#endif 3396#endif
3280 case 49: /* default bg */ 3397 case 49: /* default bg */
3281 scr_color (Color_bg, Color_bg); 3398 scr_color (Color_bg, Color_bg);
3282 break; 3399 break;
3283 3400
3284#ifndef NO_BRIGHTCOLOR 3401#ifndef NO_BRIGHTCOLOR
3285 case 90: 3402 case 90:
3286 case 91: /* set bright fg color */ 3403 case 91: /* set bright fg color */
3287 case 92: 3404 case 92:
3288 case 93: 3405 case 93:
3289 case 94: 3406 case 94:
3290 case 95: 3407 case 95:
3291 case 96: 3408 case 96:
3292 case 97: 3409 case 97:
3293 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3410 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3294 Color_fg); 3411 Color_fg);
3295 break; 3412 break;
3296 case 100: 3413 case 100:
3297 case 101: /* set bright bg color */ 3414 case 101: /* set bright bg color */
3298 case 102: 3415 case 102:
3299 case 103: 3416 case 103:
3300 case 104: 3417 case 104:
3301 case 105: 3418 case 105:
3302 case 106: 3419 case 106:
3303 case 107: 3420 case 107:
3304 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3421 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3305 Color_bg); 3422 Color_bg);
3306 break; 3423 break;
3307#endif 3424#endif
3308 } 3425
3426 }
3309 } 3427 }
3310} 3428}
3311/*}}} */ 3429/*}}} */
3312 3430
3313/*{{{ process Rob Nation's own graphics mode sequences */ 3431/*{{{ process Rob Nation's own graphics mode sequences */
3314void 3432void
3315rxvt_term::process_graphics () 3433rxvt_term::process_graphics ()
3316{ 3434{
3317 unsigned char ch, cmd = cmd_getc (); 3435 unsigned char ch, cmd = cmd_getc ();
3318 3436
3319#ifndef RXVT_GRAPHICS 3437 if (cmd == 'Q')
3320 if (cmd == 'Q') { /* query graphics */ 3438 { /* query graphics */
3321 tt_printf("\033G0\n"); /* no graphics */ 3439 tt_printf ("\033G0\n"); /* no graphics */
3322 return; 3440 return;
3323 } 3441 }
3324/* swallow other graphics sequences until terminating ':' */ 3442 /* swallow other graphics sequences until terminating ':' */
3325 do 3443 do
3326 ch = cmd_getc ();
3327 while (ch != ':');
3328#else
3329 unsigned int nargs;
3330 int args[NGRX_PTS];
3331 unsigned char *text = NULL;
3332
3333 if (cmd == 'Q') { /* query graphics */
3334 tt_printf("\033G1\n"); /* yes, graphics (color) */
3335 return;
3336 }
3337 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3338 int neg;
3339
3340 ch = cmd_getc ();
3341 neg = (ch == '-');
3342 if (neg || ch == '+')
3343 ch = cmd_getc (); 3444 ch = cmd_getc ();
3344 3445 while (ch != ':');
3345 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3346 args[nargs] = args[nargs] * 10 + (ch - '0');
3347 if (neg)
3348 args[nargs] = -args[nargs];
3349
3350 nargs++;
3351 args[nargs] = 0;
3352 if (ch != ';')
3353 break;
3354 }
3355
3356 if ((cmd == 'T') && (nargs >= 5)) {
3357 int i, len = args[4];
3358
3359 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3360
3361 if (text != NULL) {
3362 for (i = 0; i < len; i++)
3363 text[i] = cmd_getc ();
3364 text[len] = '\0';
3365 }
3366 }
3367 Gr_do_graphics (cmd, nargs, args, text);
3368#endif
3369} 3446}
3370/*}}} */ 3447/*}}} */
3371 3448
3372/* ------------------------------------------------------------------------- */ 3449/* ------------------------------------------------------------------------- */
3373 3450
3374/* 3451/*
3375 * Send printf() formatted output to the command. 3452 * Send printf () formatted output to the command.
3376 * Only use for small amounts of data. 3453 * Only use for small amounts of data.
3377 */ 3454 */
3378void 3455void
3379rxvt_term::tt_printf (const char *fmt,...) 3456rxvt_term::tt_printf (const char *fmt,...)
3380{ 3457{

Diff Legend

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