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.21 by pcg, Thu Dec 18 08:06:46 2003 UTC vs.
Revision 1.39 by pcg, Mon Feb 9 07:15:46 2004 UTC

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

Diff Legend

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