ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.15 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.51 by pcg, Sat Mar 6 00:05:01 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.15 2003/12/18 05:45:11 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>
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
49static char curlocale[128]; 49static char curlocale[128];
50 50
51void 51void
52rxvt_set_locale (const char *locale) 52rxvt_set_locale (const char *locale)
53{ 53{
54 if (locale && strncmp (locale, curlocale, 128)) 54 if (locale && STRNCMP (locale, curlocale, 128))
55 { 55 {
56 strncpy (curlocale, locale, 128); 56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale); 57 setlocale (LC_CTYPE, curlocale);
58 } 58 }
59} 59}
60 60
61class rxvt_composite_vec rxvt_composite;
62
63text_t rxvt_composite_vec::compose (uint32_t c1, uint32_t c2)
64{
65 compose_char *cc;
66
67 // break compose chains, as stupid readline really likes to duplicate
68 // composing characters for some reason near the end of a line.
69 cc = (*this)[c1];
70 while (cc)
71 {
72 if (cc->c2 == c2) return c1;
73 cc = (*this)[cc->c1];
74 }
75
76 // check to see wether this combination already exists otherwise
77 for (cc = v.end (); cc-- > v.begin (); )
78 {
79 if (cc->c1 == c1 && cc->c2 == c2)
80 return COMPOSE_LO + (cc - v.begin ());
81 }
82
83 // allocate a new combination
84 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
85 {
86 static int seen;
87
88 if (!seen++)
89 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
90
91 return REPLACEMENT_CHAR;
92 }
93
94 v.push_back (compose_char (c1, c2));
95
96 return v.size () - 1 + COMPOSE_LO;
97}
98
99int rxvt_composite_vec::expand (uint32_t c, wchar_t *r)
100{
101 compose_char *cc = (*this)[c];
102
103 if (!cc)
104 {
105 if (r) *r = c;
106 return 1;
107 }
108
109 int len = expand (cc->c1, r);
110
111 if (r) r += len;
112
113 if (cc->c2 != NOCHAR)
114 {
115 len++;
116 if (r) *r++ = cc->c2;
117 }
118
119 return len;
120
121}
122
123extern struct rxvt_composite_vec rxvt_composite;
61void * 124void *
62rxvt_term::operator new (size_t s) 125rxvt_term::operator new (size_t s)
63{ 126{
64 void *p = malloc (s); 127 void *p = malloc (s);
65 128
72{ 135{
73 free (p); 136 free (p);
74} 137}
75 138
76rxvt_term::rxvt_term () 139rxvt_term::rxvt_term ()
140 :
141 rootwin_ev (this, &rxvt_term::rootwin_cb),
142 termwin_ev (this, &rxvt_term::x_cb),
77: pty_ev (this, &rxvt_term::pty_cb), 143 vt_ev (this, &rxvt_term::x_cb),
144#ifdef HAVE_SCROLLBARS
145 scrollbar_ev (this, &rxvt_term::x_cb),
146#endif
147#ifdef MENUBAR
148 menubar_ev (this, &rxvt_term::x_cb),
149#endif
78#ifdef CURSOR_BLINK 150#ifdef CURSOR_BLINK
151 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
152#endif
153#ifdef TEXT_BLINK
79 blink_ev (this, &rxvt_term::blink_cb), 154 text_blink_ev (this, &rxvt_term::text_blink_cb),
80#endif 155#endif
81#ifdef POINTER_BLANK 156#ifdef POINTER_BLANK
82 pointer_ev (this, &rxvt_term::pointer_cb), 157 pointer_ev (this, &rxvt_term::pointer_cb),
83#endif 158#endif
159#ifdef USE_XIM
84 x_ev (this, &rxvt_term::x_cb), 160 im_ev (this, &rxvt_term::im_cb),
161#endif
162 check_ev (this, &rxvt_term::check_cb),
85 destroy_ev (this, &rxvt_term::destroy_cb), 163 destroy_ev (this, &rxvt_term::destroy_cb),
86 check_ev (this, &rxvt_term::check_cb), 164 pty_ev (this, &rxvt_term::pty_cb),
87 incr_ev (this, &rxvt_term::incr_cb) 165 incr_ev (this, &rxvt_term::incr_cb)
88{ 166{
89 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 167 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
90} 168}
91 169
92rxvt_term::~rxvt_term () 170rxvt_term::~rxvt_term ()
93{ 171{
172 if (cmd_fd >= 0)
173 close (cmd_fd);
174
175#ifndef NO_SETOWNER_TTYDEV
176 privileged_ttydev (RESTORE);
177#endif
178#ifdef UTMP_SUPPORT
179 privileged_utmp (RESTORE);
180#endif
181
182 delete TermWin.fontset;
183
184 if (display)
185 {
186#if defined(MENUBAR) && (MENUBAR_MAX > 1)
187 delete menuBar.drawable;
188 //if (menuBar.win)
189 // XDestroyWindow (display->display, menuBar.win);
190#endif
191 delete TermWin.drawable;
192 // destroy all windows
193 if (TermWin.parent[0])
194 XDestroyWindow (display->display, TermWin.parent[0]);
195 }
196
197 // TODO: free pixcolours, colours should become part of rxvt_display
198
199 delete PixColors;
200
201 displays.put (display);
202
94 scr_release (); 203 scr_release ();
95 204
205 free (env_windowid);
206 free (env_display);
207 free (env_term);
208 free (env_colorfgbg);
96 free (locale); 209 free (locale);
97 free (codeset); 210 free (codeset);
98 211
99#ifndef NO_SETOWNER_TTYDEV 212 delete envv;
100 rxvt_privileged_ttydev (this, RESTORE); 213 delete argv;
101#endif 214}
102#ifdef UTMP_SUPPORT 215
103 rxvt_privileged_utmp (this, RESTORE); 216void
104#endif 217rxvt_term::destroy ()
218{
219 if (display)
220 {
221 rootwin_ev.stop (display);
222 termwin_ev.stop (display);
223 vt_ev.stop (display);
105#ifdef USE_XIM 224#ifdef USE_XIM
106 if (Input_Context != NULL) 225 im_destroy ();
226 im_ev.stop (display);
227#endif
228#ifdef HAVE_SCROLLBARS
229 scrollbar_ev.stop (display);
230#endif
231#ifdef MENUBAR
232 menubar_ev.stop (display);
233#endif
107 { 234 }
108 XDestroyIC (Input_Context);
109 Input_Context = NULL;
110 }
111#endif
112 235
113 if (cmd_fd >= 0)
114 close (cmd_fd);
115
116 if (Xfd >= 0)
117 XCloseDisplay (Xdisplay);
118
119 delete PixColors;
120}
121
122void
123rxvt_term::destroy ()
124{
125 check_ev.stop (); 236 check_ev.stop ();
126 pty_ev.stop (); 237 pty_ev.stop ();
127 x_ev.stop ();
128#ifdef CURSOR_BLINK 238#ifdef CURSOR_BLINK
239 cursor_blink_ev.stop ();
240#endif
241#ifdef TEXT_BLINK
129 blink_ev.stop (); 242 text_blink_ev.stop ();
130#endif 243#endif
131#ifdef POINTER_BLANK 244#ifdef POINTER_BLANK
132 pointer_ev.stop (); 245 pointer_ev.stop ();
133#endif 246#endif
134 247
142 255
143 delete this; 256 delete this;
144} 257}
145 258
146/*----------------------------------------------------------------------*/ 259/*----------------------------------------------------------------------*/
147/* rxvt_init() */ 260/* rxvt_init () */
148/* LIBPROTO */ 261/* LIBPROTO */
149rxvt_t 262rxvt_t
150rxvt_init (int argc, const char *const *argv) 263rxvt_init (int argc, const char *const *argv)
151{ 264{
152 SET_R (new rxvt_term); 265 SET_R (new rxvt_term);
153 dR;
154 266
155 if (!R->init_vars () || !R->init (argc, argv)) 267 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
156 { 268 {
157 delete R; 269 delete GET_R;
158 return NULL; 270 SET_R (0);
159 } 271 }
160 272
161 return R; 273 return GET_R;
162} 274}
163 275
164/* EXTPROTO */ 276static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
277
165void 278void
166rxvt_init_signals () 279rxvt_init_signals ()
167{ 280{
168/* install exit handler for cleanup */ 281 /* install exit handler for cleanup */
169#if 0 282#if 0
170#ifdef HAVE_ATEXIT 283#ifdef HAVE_ATEXIT
171 atexit(rxvt_clean_exit); 284 atexit (rxvt_clean_exit);
172#else 285#else
173#endif 286#endif
174#endif 287#endif
175 288
176 struct sigaction sa; 289 struct sigaction sa;
182 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 295 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
183 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 296 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
184 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 297 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
185 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 298 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
186 299
187/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 300 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
188/* signal (SIGURG, SIG_DFL); */ 301 /* signal (SIGURG, SIG_DFL); */
189 302
190 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 303 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
191 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 304 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
192} 305}
193 306
194bool 307bool
195rxvt_term::init (int argc, const char *const *argv) 308rxvt_term::init (int argc, const char *const *argv)
199 * If we need privileges in any area then we must specifically request it. 312 * If we need privileges in any area then we must specifically request it.
200 * We should only need to be root in these cases: 313 * We should only need to be root in these cases:
201 * 1. write utmp entries on some systems 314 * 1. write utmp entries on some systems
202 * 2. chown tty on some systems 315 * 2. chown tty on some systems
203 */ 316 */
204 rxvt_privileges (this, SAVE); 317 privileges (SAVE);
205 rxvt_privileges (this, IGNORE); 318 privileges (IGNORE);
206
207#if HAVE_XSETLOCALE || HAVE_SETLOCALE
208 locale = strdup (setlocale (LC_CTYPE, ""));
209#endif
210#if HAVE_NL_LANGINFO
211 codeset = strdup (nl_langinfo (CODESET));
212#endif
213 319
214 init_secondary (); 320 init_secondary ();
215 321
216 const char **cmd_argv = init_resources (argc, argv); 322 const char **cmd_argv = init_resources (argc, argv);
217 323
324 set_locale ("");
325
218#if (MENUBAR_MAX) 326#if MENUBAR_MAX
219 rxvt_menubar_read (this, rs[Rs_menu]); 327 menubar_read (rs[Rs_menu]);
220#endif 328#endif
221#ifdef HAVE_SCROLLBARS 329#ifdef HAVE_SCROLLBARS
222 if (Options & Opt_scrollBar) 330 if (Options & Opt_scrollBar)
223 scrollBar.setIdle (); /* set existence for size calculations */ 331 scrollBar.setIdle (); /* set existence for size calculations */
224#endif 332#endif
225 333
226 rxvt_Create_Windows (this, argc, argv); 334 create_windows (argc, argv);
227 335
228 init_xlocale (); 336 init_xlocale ();
229 337
230 scr_reset (); /* initialize screen */ 338 scr_reset (); /* initialize screen */
231#ifdef RXVT_GRAPHICS
232 rxvt_Gr_reset (this); /* reset graphics */
233#endif
234 339
235#if 0 340#if 0
236#ifdef DEBUG_X
237 XSynchronize(Xdisplay, True); 341 XSynchronize (display->display, True);
238#endif
239#endif 342#endif
240 343
241#ifdef HAVE_SCROLLBARS 344#ifdef HAVE_SCROLLBARS
242 if (Options & Opt_scrollBar) 345 if (Options & Opt_scrollBar)
243 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 346 resize_scrollbar (); /* create and map scrollbar */
244#endif 347#endif
245#if (MENUBAR_MAX) 348#if (MENUBAR_MAX)
246 if (menubar_visible(r)) 349 if (menubar_visible ())
247 XMapWindow (Xdisplay, menuBar.win); 350 XMapWindow (display->display, menuBar.win);
248#endif 351#endif
249#ifdef TRANSPARENT 352#ifdef TRANSPARENT
250 if (Options & Opt_transparent) 353 if (Options & Opt_transparent)
251 { 354 {
252 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 355 XSelectInput (display->display, display->root, PropertyChangeMask);
253 rxvt_check_our_parents (this); 356 check_our_parents ();
254 } 357 }
255#endif 358#endif
359
360 rootwin_ev.start (display, display->root);
361
256 XMapWindow (Xdisplay, TermWin.vt); 362 XMapWindow (display->display, TermWin.vt);
257 XMapWindow (Xdisplay, TermWin.parent[0]); 363 XMapWindow (display->display, TermWin.parent[0]);
258 364
259 init_env ();
260 init_command (cmd_argv); 365 init_command (cmd_argv);
261 366
262 x_ev.start (Xfd, EVENT_READ);
263 pty_ev.start (cmd_fd, EVENT_READ); 367 pty_ev.start (cmd_fd, EVENT_READ);
264 368
265 check_ev.start (); 369 check_ev.start ();
266
267 process_x_events ();
268 370
269 return true; 371 return true;
270} 372}
271 373
272/* ------------------------------------------------------------------------- * 374/* ------------------------------------------------------------------------- *
276 * Catch a SIGCHLD signal and exit if the direct child has died 378 * Catch a SIGCHLD signal and exit if the direct child has died
277 */ 379 */
278/* ARGSUSED */ 380/* ARGSUSED */
279/* EXTPROTO */ 381/* EXTPROTO */
280RETSIGTYPE 382RETSIGTYPE
281rxvt_Child_signal(int sig __attribute__ ((unused))) 383rxvt_Child_signal (int sig __attribute__ ((unused)))
282{ 384{
283 int pid, save_errno = errno; 385 int pid, save_errno = errno;
284 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 386 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
285 ; 387 ;
286 errno = save_errno; 388 errno = save_errno;
287 389
288#if 0 390#if 0
289 if (pid == R->cmd_pid) 391 if (pid == cmd_pid)
290 exit (EXIT_SUCCESS); 392 exit (EXIT_SUCCESS);
291#endif 393#endif
292} 394}
293 395
294/* 396/*
295 * Catch a fatal signal and tidy up before quitting 397 * Catch a fatal signal and tidy up before quitting
296 */ 398 */
297/* EXTPROTO */ 399/* EXTPROTO */
298RETSIGTYPE 400RETSIGTYPE
299rxvt_Exit_signal(int sig) 401rxvt_Exit_signal (int sig)
300{ 402{
301 signal(sig, SIG_DFL); 403 signal (sig, SIG_DFL);
302#ifdef DEBUG_CMD 404#ifdef DEBUG_CMD
303 rxvt_print_error("signal %d", sig); 405 rxvt_print_error ("signal %d", sig);
304#endif 406#endif
305 rxvt_clean_exit(); 407 rxvt_clean_exit ();
306 kill(getpid(), sig); 408 kill (getpid (), sig);
307} 409}
308 410
309/* ARGSUSED */
310/* INTPROTO */ 411/* INTPROTO */
311int 412int
312rxvt_xerror_handler(const Display * display 413rxvt_xerror_handler (Display *display, XErrorEvent *event)
313 __attribute__ ((unused)), const XErrorEvent * event)
314{ 414{
315 dR;
316
317 if (R->allowedxerror == -1) 415 if (GET_R->allowedxerror == -1)
318 R->allowedxerror = event->error_code; 416 GET_R->allowedxerror = event->error_code;
319 else 417 else
320 { 418 {
321 rxvt_print_error("XError: Request: %d . %d, Error: %d", 419 old_xerror_handler (display, event);
322 event->request_code, event->minor_code,
323 event->error_code);
324
325 R->destroy (); 420 GET_R->destroy ();
326 } 421 }
327 422
328 return 0; 423 return 0;
329} 424}
330 425
335 */ 430 */
336/* EXTPROTO */ 431/* EXTPROTO */
337void 432void
338rxvt_clean_exit () 433rxvt_clean_exit ()
339{ 434{
340 dR; 435 // TODO: rxvtd should clean up all ressources
341 436 if (GET_R)
342 R->destroy (); 437 GET_R->destroy ();
343} 438}
344 439
345/* ------------------------------------------------------------------------- * 440/* ------------------------------------------------------------------------- *
346 * MEMORY ALLOCATION WRAPPERS * 441 * MEMORY ALLOCATION WRAPPERS *
347 * ------------------------------------------------------------------------- */ 442 * ------------------------------------------------------------------------- */
348/* EXTPROTO */ 443/* EXTPROTO */
349void * 444void *
350rxvt_malloc(size_t size) 445rxvt_malloc (size_t size)
351{ 446{
352 void *p; 447 void *p;
353 448
354 p = malloc(size); 449 p = malloc (size);
355 if (p) 450 if (p)
356 return p; 451 return p;
357 452
358 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 453 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
359 rxvt_clean_exit(); 454 rxvt_clean_exit ();
360 exit(EXIT_FAILURE); 455 exit (EXIT_FAILURE);
361/* NOTREACHED */ 456 /* NOTREACHED */
362} 457}
363 458
364/* EXTPROTO */ 459/* EXTPROTO */
365void * 460void *
366rxvt_calloc(size_t number, size_t size) 461rxvt_calloc (size_t number, size_t size)
367{ 462{
368 void *p; 463 void *p;
369 464
370 p = calloc(number, size); 465 p = calloc (number, size);
371 if (p) 466 if (p)
372 return p; 467 return p;
373 468
374 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 469 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
375 rxvt_clean_exit(); 470 rxvt_clean_exit ();
376 exit(EXIT_FAILURE); 471 exit (EXIT_FAILURE);
377/* NOTREACHED */ 472 /* NOTREACHED */
378} 473}
379 474
380/* EXTPROTO */ 475/* EXTPROTO */
381void * 476void *
382rxvt_realloc(void *ptr, size_t size) 477rxvt_realloc (void *ptr, size_t size)
383{ 478{
384 void *p; 479 void *p;
385 480
386 if (ptr) 481 if (ptr)
387 p = realloc(ptr, size); 482 p = realloc (ptr, size);
388 else 483 else
389 p = malloc(size); 484 p = malloc (size);
390 if (p) 485 if (p)
391 return p; 486 return p;
392 487
393 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 488 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
394 rxvt_clean_exit(); 489 rxvt_clean_exit ();
395 exit(EXIT_FAILURE); 490 exit (EXIT_FAILURE);
396/* NOTREACHED */ 491 /* NOTREACHED */
397} 492}
398 493
399/* ------------------------------------------------------------------------- * 494/* ------------------------------------------------------------------------- *
400 * PRIVILEGED OPERATIONS * 495 * PRIVILEGED OPERATIONS *
401 * ------------------------------------------------------------------------- */ 496 * ------------------------------------------------------------------------- */
402/* take care of suid/sgid super-user (root) privileges */ 497/* take care of suid/sgid super-user (root) privileges */
403/* INTPROTO */
404void 498void
405rxvt_privileges(pR_ int mode) 499rxvt_term::privileges (int mode)
406{ 500{
407#if ! defined(__CYGWIN32__) 501#if ! defined(__CYGWIN32__)
408# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 502# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
409/* setreuid() is the poor man's setuid(), seteuid() */ 503 /* setreuid () is the poor man's setuid (), seteuid () */
410# define seteuid(a) setreuid(-1, (a)) 504# define seteuid(a) setreuid(-1, (a))
411# define setegid(a) setregid(-1, (a)) 505# define setegid(a) setregid(-1, (a))
412# define HAVE_SETEUID 506# define HAVE_SETEUID
413# endif 507# endif
414# ifdef HAVE_SETEUID 508# ifdef HAVE_SETEUID
415 switch (mode) { 509 switch (mode)
510 {
416 case IGNORE: 511 case IGNORE:
417 /* 512 /*
418 * change effective uid/gid - not real uid/gid - so we can switch 513 * change effective uid/gid - not real uid/gid - so we can switch
419 * back to root later, as required 514 * back to root later, as required
420 */ 515 */
421 seteuid(getuid()); 516 seteuid (getuid ());
422 setegid(getgid()); 517 setegid (getgid ());
423 break; 518 break;
424 case SAVE: 519 case SAVE:
425 R->euid = geteuid(); 520 euid = geteuid ();
426 R->egid = getegid(); 521 egid = getegid ();
427 break; 522 break;
428 case RESTORE: 523 case RESTORE:
429 seteuid(R->euid); 524 seteuid (euid);
430 setegid(R->egid); 525 setegid (egid);
431 break; 526 break;
432 } 527 }
433# else 528# else
434 switch (mode) { 529 switch (mode)
530 {
435 case IGNORE: 531 case IGNORE:
436 setuid(getuid()); 532 setuid (getuid ());
437 setgid(getgid()); 533 setgid (getgid ());
438 /* FALLTHROUGH */ 534 /* FALLTHROUGH */
439 case SAVE: 535 case SAVE:
440 /* FALLTHROUGH */ 536 /* FALLTHROUGH */
441 case RESTORE: 537 case RESTORE:
442 break; 538 break;
443 } 539 }
444# endif 540# endif
445#endif 541#endif
446} 542}
447 543
448#ifdef UTMP_SUPPORT 544#ifdef UTMP_SUPPORT
449/* EXTPROTO */
450void 545void
451rxvt_privileged_utmp(pR_ char action) 546rxvt_term::privileged_utmp (char action)
452{ 547{
453 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 548 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
454 action, R->next_utmp_action, getpid())); 549 action, next_utmp_action, getpid ()));
455 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 550 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
456 || (R->Options & Opt_utmpInhibit) 551 || (Options & Opt_utmpInhibit)
457 || R->ttydev == NULL || *R->ttydev == '\0') 552 || ttydev == NULL || *ttydev == '\0')
458 return; 553 return;
459 554
460 rxvt_privileges(aR_ RESTORE); 555 privileges (RESTORE);
461 if (action == SAVE) { 556 if (action == SAVE)
557 {
462 R->next_utmp_action = RESTORE; 558 next_utmp_action = RESTORE;
463 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 559 makeutent (ttydev, rs[Rs_display_name]);
560 }
561 else
464 } else { /* action == RESTORE */ 562 { /* action == RESTORE */
465 R->next_utmp_action = IGNORE; 563 next_utmp_action = IGNORE;
466 rxvt_cleanutent(aR); 564 cleanutent ();
467 } 565 }
468 rxvt_privileges(aR_ IGNORE); 566 privileges (IGNORE);
469} 567}
470#endif 568#endif
471 569
472#ifndef NO_SETOWNER_TTYDEV 570#ifndef NO_SETOWNER_TTYDEV
473/* EXTPROTO */
474void 571void
475rxvt_privileged_ttydev(pR_ char action) 572rxvt_term::privileged_ttydev (char action)
476{ 573{
477 D_MAIN((stderr, 574 D_MAIN ((stderr,
478 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 575 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
479 action, R->next_tty_action, getpid())); 576 action, next_tty_action, getpid ()));
480 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 577 if (next_tty_action != action || (action != SAVE && action != RESTORE)
481 || R->ttydev == NULL || *R->ttydev == '\0') 578 || ttydev == NULL || *ttydev == '\0')
482 return; 579 return;
483 580
484 rxvt_privileges(aR_ RESTORE); 581 privileges (RESTORE);
485 582
486 if (action == SAVE) { 583 if (action == SAVE)
584 {
487 R->next_tty_action = RESTORE; 585 next_tty_action = RESTORE;
488# ifndef RESET_TTY_TO_COMMON_DEFAULTS 586# ifndef RESET_TTY_TO_COMMON_DEFAULTS
489/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 587 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
490 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 588 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
491 R->next_tty_action = IGNORE; 589 next_tty_action = IGNORE;
492 else 590 else
493# endif 591# endif
592
494 { 593 {
495 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 594 chown (ttydev, getuid (), ttygid); /* fail silently */
496 chmod(R->ttydev, R->ttymode); 595 chmod (ttydev, ttymode);
497# ifdef HAVE_REVOKE 596# ifdef HAVE_REVOKE
498 revoke(R->ttydev); 597 revoke (ttydev);
499# endif 598# endif
599
500 } 600 }
601 }
602 else
501 } else { /* action == RESTORE */ 603 { /* action == RESTORE */
502 R->next_tty_action = IGNORE; 604 next_tty_action = IGNORE;
503# ifndef RESET_TTY_TO_COMMON_DEFAULTS 605# ifndef RESET_TTY_TO_COMMON_DEFAULTS
504 chmod(R->ttydev, R->ttyfd_stat.st_mode); 606 chmod (ttydev, ttyfd_stat.st_mode);
505 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 607 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
506# else 608# else
507 chmod(R->ttydev, 609 chmod (ttydev,
508 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 610 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
509 chown(R->ttydev, 0, 0); 611 chown (ttydev, 0, 0);
510# endif 612# endif
511 }
512 613
614 }
615
513 rxvt_privileges(aR_ IGNORE); 616 privileges (IGNORE);
514 617
515# ifndef RESET_TTY_TO_COMMON_DEFAULTS 618# ifndef RESET_TTY_TO_COMMON_DEFAULTS
516 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 619 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
517 action == RESTORE ? "Restoring" : (action == 620 action == RESTORE ? "Restoring" : (action ==
518 SAVE ? "Saving" : 621 SAVE ? "Saving" :
519 "UNKNOWN ERROR for"), R->ttydev, 622 "UNKNOWN ERROR for"), ttydev,
520 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 623 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
521 R->ttyfd_stat.st_gid)); 624 ttyfd_stat.st_gid));
522# endif 625# endif
523} 626}
524#endif 627#endif
525 628
526/*----------------------------------------------------------------------*/ 629/*----------------------------------------------------------------------*/
527/* 630/*
528 * window size/position calculcations for XSizeHint and other storage. 631 * window size/position calculcations for XSizeHint and other storage.
529 * if width/height are non-zero then override calculated width/height 632 * if width/height are non-zero then override calculated width/height
530 */ 633 */
531/* EXTPROTO */
532void 634void
533rxvt_window_calc(pR_ unsigned int width, unsigned int height) 635rxvt_term::window_calc (unsigned int width, unsigned int height)
534{ 636{
535 short recalc_x, recalc_y; 637 short recalc_x, recalc_y;
536 int x, y, sb_w, mb_h, flags; 638 int x, y, sb_w, mb_h, flags;
537 unsigned int w, h; 639 unsigned int w, h;
538 unsigned int max_width, max_height; 640 unsigned int max_width, max_height;
539 641
540 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 642 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
541 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 643 TermWin.ncol, TermWin.nrow, szHint.width,
542 R->szHint.height)); 644 szHint.height));
543 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 645 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
544 R->szHint.win_gravity = NorthWestGravity; 646 szHint.win_gravity = NorthWestGravity;
545/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 647 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
546 648
547 recalc_x = recalc_y = 0; 649 recalc_x = recalc_y = 0;
548 flags = 0; 650 flags = 0;
549 if (!R->parsed_geometry) { 651 if (!parsed_geometry)
652 {
550 R->parsed_geometry = 1; 653 parsed_geometry = 1;
551 if (R->rs[Rs_geometry]) 654 if (rs[Rs_geometry])
552 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 655 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
553 if (flags & WidthValue) { 656 if (flags & WidthValue)
657 {
554 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 658 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
555 R->szHint.flags |= USSize; 659 szHint.flags |= USSize;
556 } 660 }
557 if (flags & HeightValue) { 661 if (flags & HeightValue)
662 {
558 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 663 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
559 R->szHint.flags |= USSize; 664 szHint.flags |= USSize;
560 } 665 }
561 if (flags & XValue) { 666 if (flags & XValue)
667 {
562 R->szHint.x = x; 668 szHint.x = x;
563 R->szHint.flags |= USPosition; 669 szHint.flags |= USPosition;
564 if (flags & XNegative) { 670 if (flags & XNegative)
671 {
565 recalc_x = 1; 672 recalc_x = 1;
566 R->szHint.win_gravity = NorthEastGravity; 673 szHint.win_gravity = NorthEastGravity;
567 } 674 }
568 } 675 }
569 if (flags & YValue) { 676 if (flags & YValue)
677 {
570 R->szHint.y = y; 678 szHint.y = y;
571 R->szHint.flags |= USPosition; 679 szHint.flags |= USPosition;
572 if (flags & YNegative) { 680 if (flags & YNegative)
681 {
573 recalc_y = 1; 682 recalc_y = 1;
574 if (R->szHint.win_gravity == NorthEastGravity) 683 if (szHint.win_gravity == NorthEastGravity)
575 R->szHint.win_gravity = SouthEastGravity; 684 szHint.win_gravity = SouthEastGravity;
576 else 685 else
577 R->szHint.win_gravity = SouthWestGravity; 686 szHint.win_gravity = SouthWestGravity;
578 } 687 }
579 } 688 }
580 } 689 }
581/* TODO: BOUNDS */ 690 /* TODO: BOUNDS */
582 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 691 TermWin.width = TermWin.ncol * TermWin.fwidth;
583 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 692 TermWin.height = TermWin.nrow * TermWin.fheight;
584 max_width = MAX_COLS * R->TermWin.fwidth; 693 max_width = MAX_COLS * TermWin.fwidth;
585 max_height = MAX_ROWS * R->TermWin.fheight; 694 max_height = MAX_ROWS * TermWin.fheight;
586 695
587 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 696 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
588 697
589 sb_w = mb_h = 0; 698 sb_w = mb_h = 0;
590 R->window_vt_x = R->window_vt_y = 0; 699 window_vt_x = window_vt_y = 0;
591 if (scrollbar_visible(R)) { 700 if (scrollbar_visible ())
701 {
592 sb_w = scrollbar_TotalWidth(); 702 sb_w = scrollbar_TotalWidth ();
593 R->szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
594 if (!(R->Options & Opt_scrollBar_right)) 704 if (! (Options & Opt_scrollBar_right))
595 R->window_vt_x = sb_w; 705 window_vt_x = sb_w;
596 } 706 }
597 if (menubar_visible(R)) { 707 if (menubar_visible ())
708 {
598 mb_h = menuBar_TotalHeight(); 709 mb_h = menuBar_TotalHeight ();
599 R->szHint.base_height += mb_h; 710 szHint.base_height += mb_h;
600 R->window_vt_y = mb_h; 711 window_vt_y = mb_h;
601 } 712 }
602 R->szHint.width_inc = R->TermWin.fwidth; 713 szHint.width_inc = TermWin.fwidth;
603 R->szHint.height_inc = R->TermWin.fheight; 714 szHint.height_inc = TermWin.fheight;
604 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 715 szHint.min_width = szHint.base_width + szHint.width_inc;
605 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 716 szHint.min_height = szHint.base_height + szHint.height_inc;
606 717
607 if (width && width - R->szHint.base_width < max_width) { 718 if (width && width - szHint.base_width < max_width)
719 {
608 R->szHint.width = width; 720 szHint.width = width;
609 R->TermWin.width = width - R->szHint.base_width; 721 TermWin.width = width - szHint.base_width;
610 } else { 722 }
723 else
724 {
611 MIN_IT(R->TermWin.width, max_width); 725 MIN_IT (TermWin.width, max_width);
612 R->szHint.width = R->szHint.base_width + R->TermWin.width; 726 szHint.width = szHint.base_width + TermWin.width;
613 } 727 }
614 if (height && height - R->szHint.base_height < max_height) { 728 if (height && height - szHint.base_height < max_height)
729 {
615 R->szHint.height = height; 730 szHint.height = height;
616 R->TermWin.height = height - R->szHint.base_height; 731 TermWin.height = height - szHint.base_height;
617 } else { 732 }
733 else
734 {
618 MIN_IT(R->TermWin.height, max_height); 735 MIN_IT (TermWin.height, max_height);
619 R->szHint.height = R->szHint.base_height + R->TermWin.height; 736 szHint.height = szHint.base_height + TermWin.height;
620 } 737 }
621 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 738 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
622 R->window_sb_x = R->szHint.width - sb_w; 739 window_sb_x = szHint.width - sb_w;
623 740
624 if (recalc_x) 741 if (recalc_x)
625 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 742 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
626 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 743 - szHint.width - 2 * TermWin.ext_bwidth);
627 if (recalc_y) 744 if (recalc_y)
628 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 745 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
629 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 746 - szHint.height - 2 * TermWin.ext_bwidth);
630 747
631 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 748 TermWin.ncol = TermWin.width / TermWin.fwidth;
632 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 749 TermWin.nrow = TermWin.height / TermWin.fheight;
633 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 750 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
634 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 751 TermWin.ncol, TermWin.nrow, szHint.width,
635 R->szHint.height)); 752 szHint.height));
636 return; 753 return;
637} 754}
638 755
639/*----------------------------------------------------------------------*/ 756/*----------------------------------------------------------------------*/
640/* 757/*
641 * Tell the teletype handler what size the window is. 758 * Tell the teletype handler what size the window is.
642 * Called after a window size change. 759 * Called after a window size change.
643 */ 760 */
644void 761void
645rxvt_term::tt_winch () 762rxvt_term::tt_winch ()
646{ 763{
647 struct winsize ws; 764 struct winsize ws;
648 765
649 if (cmd_fd < 0) 766 if (cmd_fd < 0)
650 return; 767 return;
651 768
652 ws.ws_col = TermWin.ncol; 769 ws.ws_col = TermWin.ncol;
654 ws.ws_xpixel = ws.ws_ypixel = 0; 771 ws.ws_xpixel = ws.ws_ypixel = 0;
655#ifndef DEBUG_SIZE 772#ifndef DEBUG_SIZE
656 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 773 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
657#else 774#else
658 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 775 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
659 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 776 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
660# ifdef SIGWINCH 777# ifdef SIGWINCH
661 else if (cmd_pid) /* force through to the command */ 778 else if (cmd_pid) /* force through to the command */
662 kill (cmd_pid, SIGWINCH); 779 kill (cmd_pid, SIGWINCH);
663# endif 780# endif
664#endif 781#endif
665} 782}
666 783
667/*----------------------------------------------------------------------*/ 784/*----------------------------------------------------------------------*/
668/* rxvt_change_font() - Switch to a new font */ 785/* rxvt_change_font () - Switch to a new font */
669/* 786/*
670 * init = 1 - initialize 787 * init = 1 - initialize
671 * 788 *
672 * fontname == FONT_UP - switch to bigger font 789 * fontname == FONT_UP - switch to bigger font
673 * fontname == FONT_DN - switch to smaller font 790 * fontname == FONT_DN - switch to smaller font
674 */ 791 */
675/* EXTPROTO */ 792bool
676void
677rxvt_change_font(pR_ int init, const char *fontname) 793rxvt_term::change_font (const char *fontname)
678{ 794{
679} 795 if (fontname == FONT_UP)
796 {
797 // TODO
798 }
799 else if (fontname == FONT_DN)
800 {
801 // TODO
802 }
803 else
804 {
805 rxvt_fontset *fs = new rxvt_fontset (this);
680 806
681/* INTPROTO */ 807 if (fs && fs->populate (fontname ? fontname : "fixed"))
682void 808 {
809 delete TermWin.fontset;
810 TermWin.fontset = fs;
811 TermWin.fwidth = fs->base_font ()->width;
812 TermWin.fheight = fs->base_font ()->height;
813 TermWin.fbase = fs->base_font ()->ascent;
814
815 if (TermWin.parent[0])
816 {
817 resize_all_windows (0, 0, 0);
818 scr_remap_chars ();
819 scr_touch (true);
820 }
821
822 return true;
823 }
824 }
825
826 return false;
827}
828
829bool
683rxvt_font_up_down(pR_ int n, int direction) 830rxvt_term::font_up_down (int n, int direction)
684{ 831{
832 return false;
685} 833}
686 834
687/*----------------------------------------------------------------------*/ 835/*----------------------------------------------------------------------*/
688/*----------------------------------------------------------------------*/ 836/*----------------------------------------------------------------------*/
689/* xterm sequences - title, iconName, color (exptl) */ 837/* xterm sequences - title, iconName, color (exptl) */
690/* EXTPROTO */
691void 838void
692rxvt_set_title(pR_ const char *str) 839rxvt_term::set_title (const char *str)
693{ 840{
694#ifndef SMART_WINDOW_TITLE 841#ifndef SMART_WINDOW_TITLE
695 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 842 XStoreName (display->display, TermWin.parent[0], str);
696#else 843#else
697 char *name; 844 char *name;
698 845
699 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 846 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
700 name = NULL; 847 name = NULL;
701 if (name == NULL || STRCMP(name, str)) 848 if (name == NULL || STRCMP (name, str))
702 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 849 XStoreName (display->display, TermWin.parent[0], str);
703 if (name) 850 if (name)
704 XFree(name); 851 XFree (name);
705#endif 852#endif
706} 853}
707 854
708/* EXTPROTO */
709void 855void
710rxvt_set_iconName(pR_ const char *str) 856rxvt_term::set_iconName (const char *str)
711{ 857{
712#ifndef SMART_WINDOW_TITLE 858#ifndef SMART_WINDOW_TITLE
713 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 859 XSetIconName (display->display, TermWin.parent[0], str);
714#else 860#else
715 char *name; 861 char *name;
716 862
717 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 863 if (XGetIconName (display->display, TermWin.parent[0], &name))
718 name = NULL; 864 name = NULL;
719 if (name == NULL || STRCMP(name, str)) 865 if (name == NULL || STRCMP (name, str))
720 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 866 XSetIconName (display->display, TermWin.parent[0], str);
721 if (name) 867 if (name)
722 XFree(name); 868 XFree (name);
723#endif 869#endif
724} 870}
725 871
726#ifdef XTERM_COLOR_CHANGE 872#ifdef XTERM_COLOR_CHANGE
727/* EXTPROTO */
728void 873void
729rxvt_set_window_color(pR_ int idx, const char *color) 874rxvt_term::set_window_color (int idx, const char *color)
730{ 875{
731 rxvt_color xcol; 876 rxvt_color xcol;
732 int i; 877 int i;
733 878
734 if (color == NULL || *color == '\0') 879 if (color == NULL || *color == '\0')
735 return; 880 return;
736 881
737/* handle color aliases */ 882 /* handle color aliases */
738 if (isdigit(*color)) { 883 if (isdigit (*color))
884 {
739 i = atoi(color); 885 i = atoi (color);
886 if (i >= 8 && i <= 15)
740 if (i >= 8 && i <= 15) { /* bright colors */ 887 { /* bright colors */
741 i -= 8; 888 i -= 8;
742# ifndef NO_BRIGHTCOLOR 889# ifndef NO_BRIGHTCOLOR
743 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 890 PixColors[idx] = PixColors[minBrightCOLOR + i];
744 SET_PIXCOLOR(R, idx); 891 SET_PIXCOLOR (idx);
745 goto Done; 892 goto Done;
746# endif 893# endif
894
747 } 895 }
748 if (i >= 0 && i <= 7) { /* normal colors */ 896 if (i >= 0 && i <= 7)
897 { /* normal colors */
749 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 898 PixColors[idx] = PixColors[minCOLOR + i];
750 SET_PIXCOLOR(R, idx); 899 SET_PIXCOLOR (idx);
751 goto Done; 900 goto Done;
752 } 901 }
753 } 902 }
754 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 903 if (!rXParseAllocColor (& xcol, color))
755 return; 904 return;
756/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 905 /* XStoreColor (display->display, XCMAP, XColor*); */
757 906
758/* 907 /*
759 * FIXME: should free colors here, but no idea how to do it so instead, 908 * FIXME: should free colors here, but no idea how to do it so instead,
760 * so just keep gobbling up the colormap 909 * so just keep gobbling up the colormap
761 */ 910 */
762# if 0 911# if 0
763 for (i = Color_Black; i <= Color_White; i++) 912 for (i = Color_Black; i <= Color_White; i++)
764 if (R->PixColors[idx] == R->PixColors[i]) 913 if (PixColors[idx] == PixColors[i])
765 break; 914 break;
766 if (i > Color_White) { 915 if (i > Color_White)
916 {
767 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 917 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
768 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 918 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
769 DisplayPlanes(R->Xdisplay, Xscreen)); 919 DisplayPlanes (display->display, display->screen));
770 } 920 }
771# endif 921# endif
772 922
773 R->PixColors[idx] = xcol; 923 PixColors[idx] = xcol;
774 SET_PIXCOLOR(R, idx); 924 SET_PIXCOLOR (idx);
775 925
776/* XSetWindowAttributes attr; */ 926 /* XSetWindowAttributes attr; */
777/* Cursor cursor; */ 927 /* Cursor cursor; */
778 Done: 928Done:
779 if (idx == Color_bg && !(R->Options & Opt_transparent)) 929 if (idx == Color_bg && ! (Options & Opt_transparent))
780 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 930 XSetWindowBackground (display->display, TermWin.vt,
781 R->PixColors[Color_bg]); 931 PixColors[Color_bg]);
782 932
783/* handle Color_BD, scrollbar background, etc. */ 933 /* handle Color_BD, scrollbar background, etc. */
784 934
785 rxvt_set_colorfgbg (aR); 935 set_colorfgbg ();
786 R->recolour_cursor (); 936 recolour_cursor ();
787/* the only reasonable way to enforce a clean update */ 937 /* the only reasonable way to enforce a clean update */
788 rxvt_scr_poweron (aR); 938 scr_poweron ();
789} 939}
790 940
791#else 941#else
792# define rxvt_set_window_color(aR_ idx,color) ((void)0) 942# define set_window_color (idx,color) ((void)0)
793#endif /* XTERM_COLOR_CHANGE */ 943#endif /* XTERM_COLOR_CHANGE */
794 944
795void 945void
796rxvt_term::recolour_cursor () 946rxvt_term::recolour_cursor ()
797{ 947{
798#if TODO 948#if TODO
799 rxvt_color xcol[2]; 949 rxvt_color xcol[2];
800 950
801 xcol[0] = PixColors[Color_pointer]; 951 xcol[0] = PixColors[Color_pointer];
802 xcol[1] = PixColors[Color_bg]; 952 xcol[1] = PixColors[Color_bg];
803 XQueryColors (Xdisplay, XCMAP, xcol, 2); 953 XQueryColors (display->display, XCMAP, xcol, 2);
804 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1])); 954 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
805#endif 955#endif
806} 956}
807 957
808/*----------------------------------------------------------------------*/ 958/*----------------------------------------------------------------------*/
809/* 959/*
810 * find if fg/bg matches any of the normal (low-intensity) colors 960 * find if fg/bg matches any of the normal (low-intensity) colors
811 */ 961 */
812/* INTPROTO */
813void 962void
814rxvt_set_colorfgbg(pR) 963rxvt_term::set_colorfgbg ()
815{ 964{
816 unsigned int i; 965 unsigned int i;
817 const char *xpmb = "\0"; 966 const char *xpmb = "\0";
818 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 967 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
819 968
820 R->env_colorfgbg = 969 env_colorfgbg =
821 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 970 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
822 STRCPY(fstr, "default"); 971 STRCPY (fstr, "default");
823 STRCPY(bstr, "default"); 972 STRCPY (bstr, "default");
824 for (i = Color_Black; i <= Color_White; i++) 973 for (i = Color_Black; i <= Color_White; i++)
825 if (R->PixColors[Color_fg] == R->PixColors[i]) { 974 if (PixColors[Color_fg] == PixColors[i])
975 {
826 sprintf(fstr, "%d", (i - Color_Black)); 976 sprintf (fstr, "%d", (i - Color_Black));
827 break; 977 break;
828 } 978 }
829 for (i = Color_Black; i <= Color_White; i++) 979 for (i = Color_Black; i <= Color_White; i++)
830 if (R->PixColors[Color_bg] == R->PixColors[i]) { 980 if (PixColors[Color_bg] == PixColors[i])
981 {
831 sprintf(bstr, "%d", (i - Color_Black)); 982 sprintf (bstr, "%d", (i - Color_Black));
832#ifdef XPM_BACKGROUND 983#ifdef XPM_BACKGROUND
833 xpmb = "default;"; 984 xpmb = "default;";
834#endif 985#endif
835 break; 986 break;
836 } 987 }
988
837 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 989 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
838 putenv(R->env_colorfgbg);
839 990
840#ifndef NO_BRIGHTCOLOR 991#ifndef NO_BRIGHTCOLOR
841 R->colorfgbg = DEFAULT_RSTYLE; 992 colorfgbg = DEFAULT_RSTYLE;
842 for (i = minCOLOR; i <= maxCOLOR; i++) { 993 for (i = minCOLOR; i <= maxCOLOR; i++)
994 {
843 if (R->PixColors[Color_fg] == R->PixColors[i]) 995 if (PixColors[Color_fg] == PixColors[i])
844 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 996 colorfgbg = SET_FGCOLOR (colorfgbg, i);
845 if (R->PixColors[Color_bg] == R->PixColors[i]) 997 if (PixColors[Color_bg] == PixColors[i])
846 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 998 colorfgbg = SET_BGCOLOR (colorfgbg, i);
847 } 999 }
848#endif 1000#endif
849} 1001}
850 1002
851/*----------------------------------------------------------------------*/ 1003/*----------------------------------------------------------------------*/
852/* 1004/*
853 * Colour determination for low colour displays, routine from 1005 * Colour determination for low colour displays, routine from
854 * Hans de Goede <hans@highrise.nl> 1006 * Hans de Goede <hans@highrise.nl>
855 */ 1007 */
856 1008
857/* EXTPROTO */
858int 1009int
859rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 1010rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
860{ 1011{
861 screen_in_out->set(aR_ colour);
862
863 if (!screen_in_out->set(aR_ colour)) { 1012 if (!screen_in_out->set (display, colour))
1013 {
864 rxvt_print_error("can't allocate colour: %s", colour); 1014 rxvt_print_error ("can't allocate colour: %s", colour);
865 return false; 1015 return false;
866 } 1016 }
867 1017
868 return true; 1018 return true;
869} 1019}
870 1020
871/* -------------------------------------------------------------------- * 1021/* -------------------------------------------------------------------- *
872 * - WINDOW RESIZING - * 1022 * - WINDOW RESIZING - *
873 * -------------------------------------------------------------------- */ 1023 * -------------------------------------------------------------------- */
874/* EXTPROTO */
875void 1024void
876rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 1025rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
877 int ignoreparent)
878{ 1026{
879 int fix_screen; 1027 int fix_screen;
880 1028
881#ifdef SMART_RESIZE 1029#ifdef SMART_RESIZE
882 int old_width = R->szHint.width, old_height = R->szHint.height; 1030 int old_width = szHint.width, old_height = szHint.height;
883#endif 1031#endif
884 1032
885 rxvt_window_calc(aR_ width, height); 1033 window_calc (width, height);
886 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 1034 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
887 if (!ignoreparent) { 1035 if (!ignoreparent)
1036 {
888#ifdef SMART_RESIZE 1037#ifdef SMART_RESIZE
889/* 1038 /*
890 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1039 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
891 * reposition window on resize depending on placement on screen 1040 * reposition window on resize depending on placement on screen
892 */ 1041 */
893 int x, y, x1, y1; 1042 int x, y, x1, y1;
894 int dx, dy; 1043 int dx, dy;
895 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1044 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
896 Window unused_cr; 1045 Window unused_cr;
897 1046
898 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1047 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
899 0, 0, &x, &y, &unused_cr); 1048 0, 0, &x, &y, &unused_cr);
900 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 1049 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
901 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1050 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
902 /* 1051 /*
903 * if Xroot isn't the parent window, a WM will probably have offset 1052 * if display->root isn't the parent window, a WM will probably have offset
904 * our position for handles and decorations. Counter it 1053 * our position for handles and decorations. Counter it
905 */ 1054 */
906 if (x1 != x || y1 != y) { 1055 if (x1 != x || y1 != y)
1056 {
907 x -= x1; 1057 x -= x1;
908 y -= y1; 1058 y -= y1;
909 } 1059 }
910 1060
911 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 1061 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
912 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 1062 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
913 dx = old_width - R->szHint.width; 1063 dx = old_width - szHint.width;
914 dy = old_height - R->szHint.height; 1064 dy = old_height - szHint.height;
915 1065
916 /* Check position of the center of the window */ 1066 /* Check position of the center of the window */
917 if (x < x1) /* left half */ 1067 if (x < x1) /* left half */
918 dx = 0; 1068 dx = 0;
919 else if (x == x1) /* exact center */ 1069 else if (x == x1) /* exact center */
920 dx /= 2; 1070 dx /= 2;
921 if (y < y1) /* top half */ 1071 if (y < y1) /* top half */
922 dy = 0; 1072 dy = 0;
923 else if (y == y1) /* exact center */ 1073 else if (y == y1) /* exact center */
924 dy /= 2; 1074 dy /= 2;
925 1075
926 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1076 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
927 R->szHint.width, R->szHint.height); 1077 szHint.width, szHint.height);
928#else 1078#else
929 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1079 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
930 R->szHint.height); 1080 szHint.height);
931#endif 1081#endif
932 }
933 1082
1083 }
1084
934 fix_screen = (R->TermWin.ncol != R->prev_ncol 1085 fix_screen = (TermWin.ncol != prev_ncol
935 || R->TermWin.nrow != R->prev_nrow); 1086 || TermWin.nrow != prev_nrow);
1087
936 if (fix_screen || width != R->old_width || height != R->old_height) { 1088 if (fix_screen || width != old_width || height != old_height)
1089 {
937 if (scrollbar_visible(R)) { 1090 if (scrollbar_visible ())
1091 {
938 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1092 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
939 0, scrollbar_TotalWidth(), R->szHint.height); 1093 0, scrollbar_TotalWidth (), szHint.height);
940 rxvt_Resize_scrollBar(aR); 1094 resize_scrollbar ();
941 } 1095 }
1096
942 if (menubar_visible(R)) 1097 if (menubar_visible ())
943 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1098 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
944 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1099 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1100
945 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1101 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
946 R->window_vt_y, TermWin_TotalWidth(), 1102 window_vt_y, TermWin_TotalWidth (),
947 TermWin_TotalHeight()); 1103 TermWin_TotalHeight ());
948#ifdef RXVT_GRAPHICS 1104 scr_clear (height != old_height);
949 if (R->old_height)
950 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
951 R->old_height - R->szHint.base_height);
952#endif
953 rxvt_scr_clear(aR);
954#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
955 rxvt_resize_pixmap(aR); 1106 resize_pixmap ();
956#endif 1107#endif
957 }
958 1108
1109 }
1110
959 if (fix_screen || R->old_height == 0) { 1111 if (fix_screen || old_height == 0)
1112 {
960 int curr_screen = -1; 1113 int curr_screen = -1;
961 uint16_t old_ncol = R->prev_ncol; 1114 int old_ncol = prev_ncol;
962 1115
963 /* scr_reset only works on the primary screen */ 1116 /* scr_reset only works on the primary screen */
964 if (R->old_height) /* this is not the first time through */ 1117 if (old_height) /* this is not the first time through */
1118 {
1119 unsigned int ncol = TermWin.ncol;
1120 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
965 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1121 curr_screen = scr_change_screen (PRIMARY);
966 1122 TermWin.ncol = ncol;
967 R->scr_reset();
968
969 if (curr_screen >= 0) { /* this is not the first time through */
970 rxvt_scr_change_screen(aR_ curr_screen);
971 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
972 } 1123 }
973 }
974 1124
1125 scr_reset ();
1126
1127 if (curr_screen >= 0) /* this is not the first time through */
1128 {
1129 scr_change_screen (curr_screen);
1130 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1131 }
1132 }
1133
975 R->old_width = R->szHint.width; 1134 old_width = szHint.width;
976 R->old_height = R->szHint.height; 1135 old_height = szHint.height;
977 1136
978#ifdef USE_XIM 1137#ifdef USE_XIM
979 rxvt_IMSetStatusPosition(aR); 1138 IMSetStatusPosition ();
980#endif 1139#endif
981} 1140}
982 1141
983/* 1142/*
984 * Set the width/height of the vt window in characters. Units are pixels. 1143 * Set the width/height of the vt window in characters. Units are pixels.
985 * good for toggling 80/132 columns 1144 * good for toggling 80/132 columns
986 */ 1145 */
987/* EXTPROTO */
988void 1146void
989rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1147rxvt_term::set_widthheight (unsigned int width, unsigned int height)
990{ 1148{
991 XWindowAttributes wattr; 1149 XWindowAttributes wattr;
992 1150
993 if (width == 0 || height == 0) { 1151 if (width == 0 || height == 0)
1152 {
994 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1153 XGetWindowAttributes (display->display, display->root, &wattr);
995 if (width == 0) 1154 if (width == 0)
996 width = wattr.width - R->szHint.base_width; 1155 width = wattr.width - szHint.base_width;
997 if (height == 0) 1156 if (height == 0)
998 height = wattr.height - R->szHint.base_height; 1157 height = wattr.height - szHint.base_height;
999 } 1158 }
1000 if (width != R->TermWin.width || height != R->TermWin.height) { 1159 if (width != TermWin.width || height != TermWin.height)
1160 {
1001 width += R->szHint.base_width; 1161 width += szHint.base_width;
1002 height += R->szHint.base_height; 1162 height += szHint.base_height;
1003 rxvt_resize_all_windows(aR_ width, height, 0); 1163 resize_all_windows (width, height, 0);
1004 } 1164 }
1005} 1165}
1006 1166
1007/* -------------------------------------------------------------------- * 1167/* -------------------------------------------------------------------- *
1008 * - X INPUT METHOD ROUTINES - * 1168 * - X INPUT METHOD ROUTINES - *
1009 * -------------------------------------------------------------------- */ 1169 * -------------------------------------------------------------------- */
1010#ifdef USE_XIM 1170#ifdef USE_XIM
1011/* INTPROTO */ 1171
1012void 1172void
1013rxvt_setSize(pR_ XRectangle * size) 1173rxvt_term::im_set_size (XRectangle *size)
1014{ 1174{
1015 size->x = R->TermWin.int_bwidth; 1175 size->x = TermWin.int_bwidth;
1016 size->y = R->TermWin.int_bwidth; 1176 size->y = TermWin.int_bwidth;
1017 size->width = Width2Pixel(R->TermWin.ncol); 1177 size->width = Width2Pixel (TermWin.ncol);
1018 size->height = Height2Pixel(R->TermWin.nrow); 1178 size->height = Height2Pixel (TermWin.nrow);
1019} 1179}
1020 1180
1021/* INTPROTO */
1022void 1181void
1023rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1182rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1024{ 1183{
1025 *fg = R->PixColors[Color_fg]; 1184 *fg = PixColors[Color_fg];
1026 *bg = R->PixColors[Color_bg]; 1185 *bg = PixColors[Color_bg];
1027} 1186}
1028 1187
1029/* Checking whether input method is running. */ 1188/* Checking whether input method is running. */
1030/* INTPROTO */
1031Bool 1189bool
1032rxvt_IMisRunning(pR) 1190rxvt_term::IMisRunning ()
1033{ 1191{
1034 char *p; 1192 char *p;
1035 Atom atom; 1193 Atom atom;
1036 Window win; 1194 Window win;
1037 char server[IMBUFSIZ]; 1195 char server[IMBUFSIZ];
1038 1196
1039/* get current locale modifier */ 1197 /* get current locale modifier */
1040 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1198 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1199 {
1041 STRCPY(server, "@server="); 1200 STRCPY (server, "@server=");
1042 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1201 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1043 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1202 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1044 *p = '\0'; 1203 *p = '\0';
1045 1204
1046 atom = XInternAtom(R->Xdisplay, server, False); 1205 atom = XInternAtom (display->display, server, False);
1047 win = XGetSelectionOwner(R->Xdisplay, atom); 1206 win = XGetSelectionOwner (display->display, atom);
1048 if (win != None) 1207 if (win != None)
1049 return True; 1208 return True;
1050 } 1209 }
1051 return False; 1210 return False;
1052} 1211}
1053 1212
1054/* EXTPROTO */
1055void 1213void
1056rxvt_IMSendSpot(pR) 1214rxvt_term::IMSendSpot ()
1057{ 1215{
1058 XPoint spot; 1216 XPoint spot;
1059 XVaNestedList preedit_attr; 1217 XVaNestedList preedit_attr;
1060 1218
1061 if (R->Input_Context == NULL 1219 if (Input_Context == NULL
1062 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1220 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1063 || !(R->event_type == KeyPress 1221 || ! (event_type == KeyPress
1064 || R->event_type == Expose 1222 || event_type == Expose
1065 || R->event_type == NoExpose 1223 || event_type == NoExpose
1066 || R->event_type == SelectionNotify 1224 || event_type == SelectionNotify
1067 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1225 || event_type == ButtonRelease || event_type == FocusIn)
1068 || !rxvt_IMisRunning(aR)) 1226 || !IMisRunning ())
1069 return; 1227 return;
1070 1228
1071 rxvt_setPosition(aR_ & spot); 1229 im_set_position (&spot);
1072 1230
1073 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1231 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1074 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1232 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1075 XFree(preedit_attr); 1233 XFree (preedit_attr);
1076} 1234}
1077 1235
1078/* EXTPROTO */
1079void 1236void
1080rxvt_setTermFontSet(pR_ int idx)
1081{
1082 char *string;
1083 long length;
1084 int success = 0;
1085
1086 if (idx < 0 || idx >= MAX_NFONTS)
1087 return;
1088}
1089
1090/* INTPROTO */
1091void
1092rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1237rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1093 XRectangle * needed_rect) 1238 XRectangle * needed_rect)
1094{ 1239{
1095 int mbh, vtx = 0; 1240 int mbh, vtx = 0;
1096 1241
1097 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1242 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1098 vtx = scrollbar_TotalWidth(); 1243 vtx = scrollbar_TotalWidth ();
1244
1099 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1245 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1100 mbh -= R->TermWin.lineSpace; 1246 mbh -= TermWin.lineSpace;
1101 1247
1102 preedit_rect->x = needed_rect->width + vtx; 1248 preedit_rect->x = needed_rect->width + vtx;
1103 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1249 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1104 1250
1105 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1251 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1106 + vtx;
1107 preedit_rect->height = Height2Pixel(1); 1252 preedit_rect->height = Height2Pixel (1);
1108 1253
1109 status_rect->x = vtx; 1254 status_rect->x = vtx;
1110 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1255 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1111 1256
1112 status_rect->width = needed_rect->width ? needed_rect->width 1257 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1113 : Width2Pixel(R->TermWin.ncol + 1);
1114 status_rect->height = Height2Pixel(1); 1258 status_rect->height = Height2Pixel (1);
1115} 1259}
1116 1260
1117/* ARGSUSED */
1118/* INTPROTO */
1119void 1261void
1120rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1262rxvt_term::im_destroy ()
1121 __attribute__ ((unused)), XPointer call_data
1122 __attribute__ ((unused)))
1123{ 1263{
1124 dR; 1264 if (Input_Context)
1125 1265 {
1266 XDestroyIC (Input_Context);
1126 R->Input_Context = NULL; 1267 Input_Context = NULL;
1127/* To avoid Segmentation Fault in C locale: Solaris only? */ 1268 }
1128 if (STRCMP(R->locale, "C")) 1269
1129 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1270 if (input_method)
1130 rxvt_IMInstantiateCallback, NULL); 1271 {
1272 display->put_xim (input_method);
1273 input_method = 0;
1274 }
1131} 1275}
1132 1276
1133/* 1277/*
1134 * X manual pages and include files don't match on some systems: 1278 * Try to open a XIM with the current modifiers, then see if we can
1135 * some think this is an XIDProc and others an XIMProc so we can't 1279 * open a suitable preedit type
1136 * use the first argument - need to update this to be nice for
1137 * both types via some sort of configure detection
1138 */ 1280 */
1139/* ARGSUSED */ 1281bool
1140/* EXTPROTO */ 1282rxvt_term::IM_get_IC (const char *modifiers)
1141void
1142rxvt_IMInstantiateCallback(Display * unused
1143 __attribute__ ((unused)), XPointer client_data
1144 __attribute__ ((unused)), XPointer call_data
1145 __attribute__ ((unused)))
1146{ 1283{
1147 dR; 1284 int i, j, found;
1285 XIM xim;
1286 XPoint spot;
1287 XRectangle rect, status_rect, needed_rect;
1288 unsigned long fg, bg;
1289 const char *p;
1290 char **s;
1291 XIMStyles *xim_styles;
1292 XVaNestedList preedit_attr, status_attr;
1293
1294 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1295 return false;
1296
1297 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1298 input_method = display->get_xim (locale, modifiers);
1299 if (input_method == NULL)
1300 return false;
1301
1302 xim = input_method->xim;
1303
1304 xim_styles = NULL;
1305 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1306 || !xim_styles || !xim_styles->count_styles)
1307 {
1308 display->put_xim (input_method);
1309 return false;
1310 }
1311
1312 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1313 s = rxvt_splitcommastring (p);
1314 for (i = found = 0; !found && s[i]; i++)
1315 {
1316 if (!STRCMP (s[i], "OverTheSpot"))
1317 input_style = (XIMPreeditPosition | XIMStatusNothing);
1318 else if (!STRCMP (s[i], "OffTheSpot"))
1319 input_style = (XIMPreeditArea | XIMStatusArea);
1320 else if (!STRCMP (s[i], "Root"))
1321 input_style = (XIMPreeditNothing | XIMStatusNothing);
1322
1323 for (j = 0; j < xim_styles->count_styles; j++)
1324 if (input_style == xim_styles->supported_styles[j])
1325 {
1326 found = 1;
1327 break;
1328 }
1329 }
1330
1331 for (i = 0; s[i]; i++)
1332 free (s[i]);
1333
1334 free (s);
1335 XFree (xim_styles);
1336
1337 if (!found)
1338 {
1339 display->put_xim (input_method);
1340 return false;
1341 }
1342
1343 preedit_attr = status_attr = NULL;
1344
1345 if (input_style & XIMPreeditPosition)
1346 {
1347 im_set_size (&rect);
1348 im_set_position (&spot);
1349 im_set_color (&fg, &bg);
1350
1351 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1352 XNSpotLocation, &spot,
1353 XNForeground, fg, XNBackground, bg,
1354 //XNFontSet, TermWin.fontset,
1355 NULL);
1356 }
1357 else if (input_style & XIMPreeditArea)
1358 {
1359 im_set_color (&fg, &bg);
1360
1361 /*
1362 * The necessary width of preedit area is unknown
1363 * until create input context.
1364 */
1365 needed_rect.width = 0;
1366
1367 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1368
1369 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1370 XNForeground, fg, XNBackground, bg,
1371 //XNFontSet, TermWin.fontset,
1372 NULL);
1373 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1374 XNForeground, fg, XNBackground, bg,
1375 //XNFontSet, TermWin.fontset,
1376 NULL);
1377 }
1378
1379 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1380 XNClientWindow, TermWin.parent[0],
1381 XNFocusWindow, TermWin.parent[0],
1382 preedit_attr ? XNPreeditAttributes : NULL,
1383 preedit_attr,
1384 status_attr ? XNStatusAttributes : NULL,
1385 status_attr, NULL);
1386 if (preedit_attr) XFree (preedit_attr);
1387 if (status_attr) XFree (status_attr);
1388
1389 if (Input_Context == NULL)
1390 {
1391 rxvt_print_error ("failed to create input context");
1392 display->put_xim (input_method);
1393 return false;
1394 }
1395
1396 if (input_style & XIMPreeditArea)
1397 IMSetStatusPosition ();
1398
1399 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1400 return true;
1401}
1402
1403void
1404rxvt_term::im_cb ()
1405{
1148 int i, found, had_im; 1406 int i, found, had_im;
1149 const char *p; 1407 const char *p;
1150 char **s; 1408 char **s;
1151 char buf[IMBUFSIZ]; 1409 char buf[IMBUFSIZ];
1152 1410
1411 im_destroy ();
1412
1153 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1413 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1154 if (R->Input_Context) 1414 if (Input_Context)
1155 return; 1415 return;
1156 1416
1157#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1417#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1158 if (R->rs[Rs_imLocale]) 1418 if (rs[Rs_imLocale])
1159 setlocale (LC_CTYPE, R->rs[Rs_imLocale]); 1419 SET_LOCALE (rs[Rs_imLocale]);
1160#endif 1420#endif
1161 1421
1162 p = R->rs[Rs_inputMethod]; 1422 p = rs[Rs_inputMethod];
1163 if (p && *p) 1423 if (p && *p)
1164 { 1424 {
1165 bool found = false; 1425 bool found = false;
1166 1426
1167 s = rxvt_splitcommastring (p); 1427 s = rxvt_splitcommastring (p);
1169 { 1429 {
1170 if (*s[i]) 1430 if (*s[i])
1171 { 1431 {
1172 STRCPY (buf, "@im="); 1432 STRCPY (buf, "@im=");
1173 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1433 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1174 if ((p = XSetLocaleModifiers (buf)) && *p 1434 if (IM_get_IC (buf))
1175 && rxvt_IM_get_IC (aR))
1176 { 1435 {
1177 found = true; 1436 found = true;
1178 break; 1437 break;
1179 } 1438 }
1180 } 1439 }
1181 } 1440 }
1182 for (i = 0; s[i]; i++) 1441 for (i = 0; s[i]; i++)
1183 free(s[i]); 1442 free (s[i]);
1184 free(s); 1443 free (s);
1185 1444
1186 if (found) 1445 if (found)
1187 goto done; 1446 goto done;
1188 } 1447 }
1189 1448
1190/* try with XMODIFIERS env. var. */ 1449 /* try with XMODIFIERS env. var. */
1191 if ((p = XSetLocaleModifiers ("")) && *p 1450 if (IM_get_IC (""))
1192 && rxvt_IM_get_IC (aR))
1193 goto done; 1451 goto done;
1194 1452
1195/* try with no modifiers base IF the user didn't specify an IM */ 1453 /* try with no modifiers base IF the user didn't specify an IM */
1196 if ((p = XSetLocaleModifiers ("@im=none")) && *p 1454 if (IM_get_IC ("@im=none"))
1197 && rxvt_IM_get_IC (aR) == True)
1198 goto done; 1455 goto done;
1199 1456
1200done: 1457done:
1201#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1458#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1202 if (R->rs[Rs_imLocale]) 1459 if (rs[Rs_imLocale])
1203 setlocale (LC_CTYPE, R->locale); 1460 SET_LOCALE (locale);
1204#endif 1461#endif
1205} 1462}
1206 1463
1207/*
1208 * Try to open a XIM with the current modifiers, then see if we can
1209 * open a suitable preedit type
1210 */
1211/* INTPROTO */
1212Bool
1213rxvt_IM_get_IC(pR)
1214{
1215 int i, j, found;
1216 XIM xim;
1217 XPoint spot;
1218 XRectangle rect, status_rect, needed_rect;
1219 unsigned long fg, bg;
1220 const char *p;
1221 char **s;
1222 XIMStyles *xim_styles;
1223 XVaNestedList preedit_attr, status_attr;
1224 XIMCallback ximcallback;
1225
1226 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1227 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL);
1228 if (xim == NULL)
1229 return False;
1230
1231 xim_styles = NULL;
1232 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL)
1233 || !xim_styles || !xim_styles->count_styles) {
1234 XCloseIM(xim);
1235 return False;
1236 }
1237
1238 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType]
1239 : "OverTheSpot,OffTheSpot,Root";
1240 s = rxvt_splitcommastring(p);
1241 for (i = found = 0; !found && s[i]; i++) {
1242 if (!STRCMP(s[i], "OverTheSpot"))
1243 R->input_style = (XIMPreeditPosition | XIMStatusNothing);
1244 else if (!STRCMP(s[i], "OffTheSpot"))
1245 R->input_style = (XIMPreeditArea | XIMStatusArea);
1246 else if (!STRCMP(s[i], "Root"))
1247 R->input_style = (XIMPreeditNothing | XIMStatusNothing);
1248
1249 for (j = 0; j < xim_styles->count_styles; j++)
1250 if (R->input_style == xim_styles->supported_styles[j]) {
1251 found = 1;
1252 break;
1253 }
1254 }
1255 for (i = 0; s[i]; i++)
1256 free(s[i]);
1257 free(s);
1258 XFree(xim_styles);
1259
1260 if (!found) {
1261 XCloseIM(xim);
1262 return False;
1263 }
1264
1265 ximcallback.callback = rxvt_IMDestroyCallback;
1266
1267/* XXX: not sure why we need this (as well as IC one below) */
1268 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1269
1270 preedit_attr = status_attr = NULL;
1271
1272 if (R->input_style & XIMPreeditPosition) {
1273 rxvt_setSize(aR_ & rect);
1274 rxvt_setPosition(aR_ & spot);
1275 rxvt_setColor(aR_ & fg, &bg);
1276
1277 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1278 XNSpotLocation, &spot,
1279 XNForeground, fg, XNBackground, bg,
1280 //XNFontSet, R->TermWin.fontset,
1281 NULL);
1282 } else if (R->input_style & XIMPreeditArea) {
1283 rxvt_setColor(aR_ & fg, &bg);
1284
1285 /*
1286 * The necessary width of preedit area is unknown
1287 * until create input context.
1288 */
1289 needed_rect.width = 0;
1290
1291 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1292
1293 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1294 XNForeground, fg, XNBackground, bg,
1295 //XNFontSet, R->TermWin.fontset,
1296 NULL);
1297 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1298 XNForeground, fg, XNBackground, bg,
1299 //XNFontSet, R->TermWin.fontset,
1300 NULL);
1301 }
1302 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1303 XNClientWindow, R->TermWin.parent[0],
1304 XNFocusWindow, R->TermWin.parent[0],
1305 XNDestroyCallback, &ximcallback,
1306 preedit_attr ? XNPreeditAttributes : NULL,
1307 preedit_attr,
1308 status_attr ? XNStatusAttributes : NULL,
1309 status_attr, NULL);
1310 if (preedit_attr)
1311 XFree(preedit_attr);
1312 if (status_attr)
1313 XFree(status_attr);
1314 if (R->Input_Context == NULL) {
1315 rxvt_print_error("failed to create input context");
1316 XCloseIM(xim);
1317 return False;
1318 }
1319 if (R->input_style & XIMPreeditArea)
1320 rxvt_IMSetStatusPosition(aR);
1321 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1322 return True;
1323}
1324
1325/* EXTPROTO */
1326void 1464void
1327rxvt_IMSetStatusPosition(pR) 1465rxvt_term::IMSetStatusPosition ()
1328{ 1466{
1329 XRectangle preedit_rect, status_rect, *needed_rect; 1467 XRectangle preedit_rect, status_rect, *needed_rect;
1330 XVaNestedList preedit_attr, status_attr; 1468 XVaNestedList preedit_attr, status_attr;
1331 1469
1332 if (R->Input_Context == NULL 1470 if (Input_Context == NULL
1333 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1471 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1334 || !rxvt_IMisRunning(aR)) 1472 || !IMisRunning ())
1335 return; 1473 return;
1336 1474
1337/* Getting the necessary width of preedit area */ 1475 /* Getting the necessary width of preedit area */
1338 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1476 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1339 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1477 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1340 XFree(status_attr); 1478 XFree (status_attr);
1341 1479
1342 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1480 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1343 1481
1344 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1482 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1345 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1483 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1346 1484
1347 XSetICValues(R->Input_Context, 1485 XSetICValues (Input_Context,
1348 XNPreeditAttributes, preedit_attr, 1486 XNPreeditAttributes, preedit_attr,
1349 XNStatusAttributes, status_attr, NULL); 1487 XNStatusAttributes, status_attr, NULL);
1350 1488
1351 XFree(preedit_attr); 1489 XFree (preedit_attr);
1352 XFree(status_attr); 1490 XFree (status_attr);
1353} 1491}
1354#endif /* USE_XIM */ 1492#endif /* USE_XIM */
1355 1493
1356/*----------------------------------------------------------------------*/ 1494/*----------------------------------------------------------------------*/
1357rxvt_t rxvt_current_term; 1495rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines