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.25 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.42 by pcg, Sun Feb 22 10:38:11 2004 UTC

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

Diff Legend

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