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.11 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.67 by pcg, Thu Mar 11 00:53:19 2004 UTC

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

Diff Legend

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