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

Diff Legend

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