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.7 by pcg, Tue Nov 25 17:34:47 2003 UTC vs.
Revision 1.64 by pcg, Wed Mar 3 04:07:52 2004 UTC

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

Diff Legend

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