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.16 by pcg, Thu Dec 18 07:31:19 2003 UTC vs.
Revision 1.44 by pcg, Tue Feb 24 16:25:44 2004 UTC

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

Diff Legend

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