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.155 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.251 by sasha, Tue Sep 18 22:01:36 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
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 * Copyright (c) 2003-2006 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.
… …
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
53static char curlocale[128]; 56static char curlocale[128], savelocale[128];
54 57
55bool 58bool
56rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
57{ 60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
58 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
59 return false; 67 return false;
60 68
61 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
62 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
63 return true; 71 return true;
72}
73
74void
75rxvt_push_locale (const char *locale) NOTHROW
76{
77 strcpy (savelocale, curlocale);
78 rxvt_set_locale (locale);
79}
80
81void
82rxvt_pop_locale () NOTHROW
83{
84 rxvt_set_locale (savelocale);
64} 85}
65 86
66#if ENABLE_COMBINING 87#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 88class rxvt_composite_vec rxvt_composite;
68 89
… …
127} 148}
128#endif 149#endif
129 150
130rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
131 : 152 :
132#if TRANSPARENT 153#if ENABLE_TRANSPARENCY || ENABLE_PERL
133 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
156#if HAVE_BG_PIXMAP
157 update_background_ev(this, &rxvt_term::update_background_cb),
134#endif 158#endif
135#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
136 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
137#endif 161#endif
138#ifdef MENUBAR
139 menubar_ev (this, &rxvt_term::x_cb),
140#endif
141#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
142 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 163 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143#endif 164#endif
144#ifdef TEXT_BLINK 165#ifdef TEXT_BLINK
145 text_blink_ev (this, &rxvt_term::text_blink_cb), 166 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
157 pointer_ev (this, &rxvt_term::pointer_cb), 178 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 179#endif
159#ifdef USE_XIM 180#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 181 im_ev (this, &rxvt_term::im_cb),
161#endif 182#endif
183#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb),
185#endif
162 termwin_ev (this, &rxvt_term::x_cb), 186 termwin_ev (this, &rxvt_term::x_cb),
163 vt_ev (this, &rxvt_term::x_cb), 187 vt_ev (this, &rxvt_term::x_cb),
188 child_ev (this, &rxvt_term::child_cb),
164 check_ev (this, &rxvt_term::check_cb), 189 check_ev (this, &rxvt_term::check_cb),
165 flush_ev (this, &rxvt_term::flush_cb), 190 flush_ev (this, &rxvt_term::flush_cb),
166 destroy_ev (this, &rxvt_term::destroy_cb), 191 destroy_ev (this, &rxvt_term::destroy_cb),
167 pty_ev (this, &rxvt_term::pty_cb), 192 pty_ev (this, &rxvt_term::pty_cb),
168 incr_ev (this, &rxvt_term::incr_cb) 193 incr_ev (this, &rxvt_term::incr_cb)
… …
171 196
172 termlist.push_back (this); 197 termlist.push_back (this);
173 198
174#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
175 keyboard = new keyboard_manager; 200 keyboard = new keyboard_manager;
176
177 if (!keyboard)
178 rxvt_fatal ("out of memory, aborting.\n");
179#endif 201#endif
180} 202}
181 203
182// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
183// for use before an emergency exit 205// for use before an emergency exit
184void rxvt_term::emergency_cleanup () 206void rxvt_term::emergency_cleanup ()
185{ 207{
186 if (cmd_pid) 208 if (cmd_pid)
187 kill (-cmd_pid, SIGHUP); 209 kill (-cmd_pid, SIGHUP);
188 210
189#ifdef UTMP_SUPPORT 211 pty_ev.stop ();
190 privileged_utmp (RESTORE); 212 delete pty; pty = 0;
191#endif
192
193 pty.put ();
194} 213}
195 214
196rxvt_term::~rxvt_term () 215rxvt_term::~rxvt_term ()
197{ 216{
198 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
199
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 217 termlist.erase (find (termlist.begin (), termlist.end(), this));
201 218
202 emergency_cleanup (); 219 emergency_cleanup ();
203 220
204#if ENABLE_STYLES 221#if ENABLE_STYLES
… …
208#endif 225#endif
209 delete fontset[0]; 226 delete fontset[0];
210 227
211 if (display) 228 if (display)
212 { 229 {
213 dDisp;
214
215 selection_clear (); 230 selection_clear ();
216 231
217#ifdef USE_XIM 232#ifdef USE_XIM
218 im_destroy (); 233 im_destroy ();
219#endif 234#endif
220#ifdef MENUBAR
221 if (menubarGC) XFreeGC (disp, menubarGC);
222#endif
223#ifdef XTERM_SCROLLBAR 235#ifdef XTERM_SCROLLBAR
224 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
225 if (ShadowGC) XFreeGC (disp, ShadowGC); 237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
226#endif 238#endif
227#ifdef PLAIN_SCROLLBAR 239#ifdef PLAIN_SCROLLBAR
228 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
229#endif 241#endif
230#ifdef NEXT_SCROLLBAR 242#ifdef NEXT_SCROLLBAR
231 if (blackGC) XFreeGC (disp, blackGC); 243 if (blackGC) XFreeGC (dpy, blackGC);
232 if (whiteGC) XFreeGC (disp, whiteGC); 244 if (whiteGC) XFreeGC (dpy, whiteGC);
233 if (grayGC) XFreeGC (disp, grayGC); 245 if (grayGC) XFreeGC (dpy, grayGC);
234 if (darkGC) XFreeGC (disp, darkGC); 246 if (darkGC) XFreeGC (dpy, darkGC);
235 if (stippleGC) XFreeGC (disp, stippleGC); 247 if (stippleGC) XFreeGC (dpy, stippleGC);
236 if (dimple) XFreePixmap (disp, dimple); 248 if (dimple) XFreePixmap (dpy, dimple);
237 if (upArrow) XFreePixmap (disp, upArrow); 249 if (upArrow) XFreePixmap (dpy, upArrow);
238 if (downArrow) XFreePixmap (disp, downArrow); 250 if (downArrow) XFreePixmap (dpy, downArrow);
239 if (upArrowHi) XFreePixmap (disp, upArrowHi); 251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
240 if (downArrowHi) XFreePixmap (disp, downArrowHi); 252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
241#endif 253#endif
242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 254#ifdef RXVT_SCROLLBAR
243 if (topShadowGC) XFreeGC (disp, topShadowGC); 255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
244 if (botShadowGC) XFreeGC (disp, botShadowGC); 256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
245 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
246#endif 258#endif
247 if (gc) XFreeGC (disp, gc); 259 if (gc) XFreeGC (dpy, gc);
248 260
249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
250 delete menuBar.drawable;
251 //if (menuBar.win)
252 // XDestroyWindow (disp, menuBar.win);
253#endif
254 delete drawable; 261 delete drawable;
255 // destroy all windows 262 // destroy all windows
256 if (parent[0]) 263 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 264 XDestroyWindow (dpy, parent[0]);
258 }
259 265
260 // TODO: free pixcolours, colours should become part of rxvt_display 266 for (int i = 0; i < TOTAL_COLORS; i++)
261 267 if (ISSET_PIXCOLOR (i))
262 delete pix_colors_focused; 268 {
269 pix_colors_focused [i].free (this);
263#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
271 pix_colors_unfocused [i].free (this);
272#endif
273 }
274
275 clear ();
276 }
277
278 delete [] pix_colors_focused;
279#if OFF_FOCUS_FADING
264 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
265#endif 281#endif
266 282
267 displays.put (display); 283 displays.put (display);
268 284
269 scr_release (); 285 scr_release ();
… …
272 for (int i = 0; i < allocated.size (); i++) 288 for (int i = 0; i < allocated.size (); i++)
273 free (allocated [i]); 289 free (allocated [i]);
274 290
275 free (selection.text); 291 free (selection.text);
276 // TODO: manage env vars in child only(!) 292 // TODO: manage env vars in child only(!)
277 free (env_windowid);
278 free (env_display); 293 free (env_display);
279 free (env_term); 294 free (env_term);
280 free (env_colorfgbg);
281 free (locale); 295 free (locale);
282 free (v_buffer); 296 free (v_buffer);
283 free (incr_buf); 297 free (incr_buf);
284 298
285 delete envv; 299 delete envv;
… …
288#ifdef KEYSYM_RESOURCE 302#ifdef KEYSYM_RESOURCE
289 delete keyboard; 303 delete keyboard;
290#endif 304#endif
291} 305}
292 306
307// child has exited, usually destroys
293void 308void
294rxvt_term::child_exit () 309rxvt_term::child_cb (child_watcher &w, int status)
295{ 310{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312
296 cmd_pid = 0; 313 cmd_pid = 0;
297 314
298 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
299 destroy (); 316 destroy ();
300} 317}
301 318
302void 319void
303rxvt_term::destroy () 320rxvt_term::destroy ()
304{ 321{
305 if (destroy_ev.active) 322 if (destroy_ev.active)
306 return; 323 return;
307 324
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326
308#if ENABLE_OVERLAY 327#if ENABLE_OVERLAY
309 scr_overlay_off (); 328 scr_overlay_off ();
310#endif 329#endif
311 330
312 if (display) 331 if (display)
… …
315 im_ev.stop (display); 334 im_ev.stop (display);
316#endif 335#endif
317#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
318 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
319#endif 338#endif
320#if MENUBAR 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
321 menubar_ev.stop (display);
322#endif
323#if TRANSPARENT
324 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
325#endif 341#endif
326 incr_ev.stop (); 342 incr_ev.stop ();
327 termwin_ev.stop (display); 343 termwin_ev.stop (display);
328 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
350} 366}
351 367
352void 368void
353rxvt_term::destroy_cb (time_watcher &w) 369rxvt_term::destroy_cb (time_watcher &w)
354{ 370{
355 SET_R (this); 371 make_current ();
356 372
357 delete this; 373 delete this;
358} 374}
359 375
360/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
… …
369{ 385{
370 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
371 (*t)->emergency_cleanup (); 387 (*t)->emergency_cleanup ();
372} 388}
373 389
374#if ENABLE_FRILLS 390#if !ENABLE_MINIMAL
375static void 391static void
376print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
377{ 393{
378 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
379 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
… …
427 GET_R->allowedxerror = event->error_code; 443 GET_R->allowedxerror = event->error_code;
428 else 444 else
429 { 445 {
430 // GET_R is most likely not the terminal which caused the error, 446 // GET_R is most likely not the terminal which caused the error,
431 // so just output the error and continue 447 // so just output the error and continue
432#if ENABLE_FRILLS 448#if ENABLE_MINIMAL
449 old_xerror_handler (display, event);
450#else
433 print_x_error (display, event); 451 print_x_error (display, event);
434#else
435 old_xerror_handler (display, event);
436#endif 452#endif
437 } 453 }
438 454
439 return 0; 455 return 0;
440} 456}
… …
448 _exit (EXIT_FAILURE); 464 _exit (EXIT_FAILURE);
449} 465}
450 466
451/*----------------------------------------------------------------------*/ 467/*----------------------------------------------------------------------*/
452bool 468bool
453rxvt_term::init (int argc, const char *const *argv) 469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
454{ 470{
471 this->envv = envv;
472
455 SET_R (this); 473 SET_R (this);
456
457 set_locale (""); 474 set_locale ("");
475 set_environ (envv); // few things in X do not call setlocale :(
458 476
459 if (!init_vars ()) 477 if (!init_vars ())
460 return false; 478 return false;
461 479
462 init_secondary (); 480 init_secondary ();
… …
465 483
466#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
467 keyboard->register_done (); 485 keyboard->register_done ();
468#endif 486#endif
469 487
470#if MENUBAR_MAX
471 menubar_read (rs[Rs_menu]);
472#endif
473#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 491#endif
477 492
493 pty = ptytty::create ();
494
495 create_windows (argc, argv);
496
497 init_xlocale ();
498
499 scr_reset (); // initialize screen
500
501#if 0
502 XSynchronize (dpy, True);
503#endif
504
505#ifdef HAVE_SCROLLBARS
506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */
508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
513#ifdef ENABLE_TRANSPARENCY
514 if (option (Opt_transparent))
515 {
516 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif
521 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]);
525
526 bgPixmap.set_root_pixmap ();
527 XSelectInput (dpy, display->root, PropertyChangeMask);
528 rootwin_ev.start (display, display->root);
529 }
530#endif
531
532#ifdef BG_IMAGE_FROM_FILE
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!bgPixmap.window_position_sensitive ())
547 update_background ();
548 }
549#endif
550 }
551#endif
552
478#if ENABLE_PERL 553#if ENABLE_PERL
479 rxvt_perl.init ();
480#endif
481
482 PERL_INVOKE ((this, HOOK_INIT, DT_END));
483
484 create_windows (argc, argv);
485
486 dDisp;
487
488 init_xlocale ();
489
490 scr_reset (); /* initialize screen */
491
492#if 0
493 XSynchronize (disp, True);
494#endif
495
496#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */
499#endif
500#if (MENUBAR_MAX)
501 if (menubar_visible ())
502 XMapWindow (disp, menuBar.win);
503#endif
504#ifdef TRANSPARENT
505 if (OPTION (Opt_transparent))
506 {
507 XSelectInput (disp, display->root, PropertyChangeMask);
508 check_our_parents ();
509 rootwin_ev.start (display, display->root); 554 rootwin_ev.start (display, display->root);
510 }
511#endif 555#endif
512
513 XMapWindow (disp, vt);
514 XMapWindow (disp, parent[0]);
515 556
516 set_colorfgbg (); 557 set_colorfgbg ();
517 558
518 init_command (cmd_argv); 559 init_command (cmd_argv);
519 560
520 free (cmd_argv); 561 free (cmd_argv);
521 562
563 if (pty->pty >= 0)
522 pty_ev.start (pty.pty, EVENT_READ); 564 pty_ev.start (pty->pty, EVENT_READ);
523 565
524 check_ev.start (); 566 check_ev.start ();
525 567
526 PERL_INVOKE ((this, HOOK_START, DT_END)); 568 HOOK_INVOKE ((this, HOOK_START, DT_END));
569
570#if ENABLE_XEMBED
571 if (rs[Rs_embed])
572 {
573 long info[2] = { 0, XEMBED_MAPPED };
574
575 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
576 32, PropModeReplace, (unsigned char *)&info, 2);
577 }
578#endif
579
580 XMapWindow (dpy, vt);
581 XMapWindow (dpy, parent[0]);
527 582
528 return true; 583 return true;
529} 584}
530 585
531static struct sig_handlers 586static struct sig_handlers
532{ 587{
533 sig_watcher sw_chld, sw_term, sw_int; 588 sig_watcher sw_term, sw_int;
534 589
535 void sig_chld (sig_watcher &w)
536 {
537 // we are being called for every SIGCHLD, find the corresponding term
538 int pid;
539
540 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
541 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
542 if (pid == (*t)->cmd_pid)
543 {
544 (*t)->child_exit ();
545 break;
546 }
547 }
548
549 /* 590 /*
550 * Catch a fatal signal and tidy up before quitting 591 * Catch a fatal signal and tidy up before quitting
551 */ 592 */
552 void 593 void
553 sig_term (sig_watcher &w) 594 sig_term (sig_watcher &w)
554 { 595 {
555#ifdef DEBUG_CMD
556 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
557#endif
558 rxvt_emergency_cleanup (); 596 rxvt_emergency_cleanup ();
559 signal (w.signum, SIG_DFL); 597 signal (w.signum, SIG_DFL);
560 kill (getpid (), w.signum); 598 kill (getpid (), w.signum);
561 } 599 }
562 600
563 sig_handlers () 601 sig_handlers ()
564 : sw_chld (this, &sig_handlers::sig_chld),
565 sw_term (this, &sig_handlers::sig_term), 602 : sw_term (this, &sig_handlers::sig_term),
566 sw_int (this, &sig_handlers::sig_term) 603 sw_int (this, &sig_handlers::sig_term)
567 { 604 {
568 } 605 }
569} sig_handlers; 606} sig_handlers;
570 607
608char **rxvt_environ; // startup environment
609
571void 610void
572rxvt_init () 611rxvt_init ()
573{ 612{
574 /* 613 ptytty::init ();
575 * Save and then give up any super-user privileges 614
576 * If we need privileges in any area then we must specifically request it. 615 rxvt_environ = environ;
577 * We should only need to be root in these cases:
578 * 1. write utmp entries on some systems
579 * 2. chown tty on some systems
580 */
581 rxvt_privileges (SAVE);
582 rxvt_privileges (IGNORE);
583 616
584 signal (SIGHUP, SIG_IGN); 617 signal (SIGHUP, SIG_IGN);
585 signal (SIGPIPE, SIG_IGN); 618 signal (SIGPIPE, SIG_IGN);
586 619
587 sig_handlers.sw_chld.start (SIGCHLD);
588 sig_handlers.sw_term.start (SIGTERM); 620 sig_handlers.sw_term.start (SIGTERM);
589 sig_handlers.sw_int.start (SIGINT); 621 sig_handlers.sw_int.start (SIGINT);
590 622
591 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 623 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
592 /* signal (SIGURG, SIG_DFL); */ 624 /* signal (SIGURG, SIG_DFL); */
593 625
594 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 626 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
595 // TODO: handle this with exceptions and tolerate the memory loss 627 // TODO: handle this with exceptions and tolerate the memory loss
596 XSetIOErrorHandler (rxvt_xioerror_handler); 628 XSetIOErrorHandler (rxvt_xioerror_handler);
629
630 XrmInitialize ();
597} 631}
598 632
599/* ------------------------------------------------------------------------- * 633/* ------------------------------------------------------------------------- *
600 * MEMORY ALLOCATION WRAPPERS * 634 * MEMORY ALLOCATION WRAPPERS *
601 * ------------------------------------------------------------------------- */ 635 * ------------------------------------------------------------------------- */
… …
619 rxvt_fatal ("memory allocation failure. aborting.\n"); 653 rxvt_fatal ("memory allocation failure. aborting.\n");
620 654
621 return p; 655 return p;
622} 656}
623 657
624void * 658void *
625rxvt_realloc (void *ptr, size_t size) 659rxvt_realloc (void *ptr, size_t size)
626{ 660{
627 void *p = realloc (ptr, size); 661 void *p = realloc (ptr, size);
628 662
629 if (!p) 663 if (!p)
630 rxvt_fatal ("memory allocation failure. aborting.\n"); 664 rxvt_fatal ("memory allocation failure. aborting.\n");
631 665
632 return p; 666 return p;
633} 667}
634 668
635/* ------------------------------------------------------------------------- *
636 * PRIVILEGED OPERATIONS *
637 * ------------------------------------------------------------------------- */
638/* take care of suid/sgid super-user (root) privileges */
639void
640rxvt_privileges (rxvt_privaction action)
641{
642#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
643 static uid_t euid;
644 static gid_t egid;
645#endif
646
647#if ! defined(__CYGWIN32__)
648# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
649 /* setreuid () is the poor man's setuid (), seteuid () */
650# define seteuid(a) setreuid(-1, (a))
651# define setegid(a) setregid(-1, (a))
652# define HAVE_SETEUID
653# endif
654# ifdef HAVE_SETEUID
655 switch (action)
656 {
657 case IGNORE:
658 /*
659 * change effective uid/gid - not real uid/gid - so we can switch
660 * back to root later, as required
661 */
662 seteuid (getuid ());
663 setegid (getgid ());
664 break;
665 case SAVE:
666 euid = geteuid ();
667 egid = getegid ();
668 break;
669 case RESTORE:
670 seteuid (euid);
671 setegid (egid);
672 break;
673 }
674# else
675 switch (action)
676 {
677 case IGNORE:
678 setuid (getuid ());
679 setgid (getgid ());
680 /* FALLTHROUGH */
681 case SAVE:
682 /* FALLTHROUGH */
683 case RESTORE:
684 break;
685 }
686# endif
687#endif
688}
689
690#ifdef UTMP_SUPPORT
691void
692rxvt_term::privileged_utmp (rxvt_privaction action)
693{
694 if (OPTION (Opt_utmpInhibit)
695 || !pty.name || !*pty.name)
696 return;
697
698 rxvt_privileges (RESTORE);
699
700 if (action == SAVE)
701 makeutent (pty.name, rs[Rs_display_name]);
702 else
703 cleanutent ();
704
705 rxvt_privileges (IGNORE);
706}
707#endif
708
709/*----------------------------------------------------------------------*/ 669/*----------------------------------------------------------------------*/
710/* 670/*
711 * window size/position calculcations for XSizeHint and other storage. 671 * window size/position calculations for XSizeHint and other storage.
712 * if width/height are non-zero then override calculated width/height 672 * if width/height are non-zero then override calculated width/height
713 */ 673 */
714void 674void
715rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 675rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
716{ 676{
717 short recalc_x, recalc_y; 677 short recalc_x, recalc_y;
718 int x, y, sb_w, mb_h, flags; 678 int x, y, sb_w, flags;
719 unsigned int w, h; 679 unsigned int w, h;
720 unsigned int max_width, max_height; 680 unsigned int max_width, max_height;
721 dDisp;
722
723 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
724 ncol, nrow, szHint.width, szHint.height));
725 681
726 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 682 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
727 szHint.win_gravity = NorthWestGravity; 683 szHint.win_gravity = NorthWestGravity;
728 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 684 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
729 685
… …
784 max_width = MAX_COLS * fwidth; 740 max_width = MAX_COLS * fwidth;
785 max_height = MAX_ROWS * fheight; 741 max_height = MAX_ROWS * fheight;
786 742
787 szHint.base_width = szHint.base_height = 2 * int_bwidth; 743 szHint.base_width = szHint.base_height = 2 * int_bwidth;
788 744
789 sb_w = mb_h = 0; 745 sb_w = 0;
790 window_vt_x = window_vt_y = int_bwidth; 746 window_vt_x = window_vt_y = int_bwidth;
791 747
792 if (scrollbar_visible ()) 748 if (scrollBar.state)
793 { 749 {
794 sb_w = scrollbar_TotalWidth (); 750 sb_w = scrollbar_TotalWidth ();
795 szHint.base_width += sb_w; 751 szHint.base_width += sb_w;
752
796 if (!OPTION (Opt_scrollBar_right)) 753 if (!option (Opt_scrollBar_right))
797 window_vt_x += sb_w; 754 window_vt_x += sb_w;
798 } 755 }
799 756
800 if (menubar_visible ())
801 {
802 mb_h = menuBar_TotalHeight ();
803 szHint.base_height += mb_h;
804 window_vt_y += mb_h;
805 }
806
807 szHint.width_inc = fwidth; 757 szHint.width_inc = fwidth;
808 szHint.height_inc = fheight; 758 szHint.height_inc = fheight;
809 szHint.min_width = szHint.base_width + szHint.width_inc; 759 szHint.min_width = szHint.base_width + szHint.width_inc;
810 szHint.min_height = szHint.base_height + szHint.height_inc; 760 szHint.min_height = szHint.base_height + szHint.height_inc;
811 761
812 if (newwidth && newwidth - szHint.base_width < max_width) 762 if (newwidth && newwidth - szHint.base_width < max_width)
813 { 763 {
814 szHint.width = newwidth; 764 szHint.width = newwidth;
… …
829 { 779 {
830 min_it (height, max_height); 780 min_it (height, max_height);
831 szHint.height = szHint.base_height + height; 781 szHint.height = szHint.base_height + height;
832 } 782 }
833 783
834 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 784 if (scrollBar.state && option (Opt_scrollBar_right))
835 window_sb_x = szHint.width - sb_w; 785 window_sb_x = szHint.width - sb_w;
836 786
837 if (recalc_x) 787 if (recalc_x)
838 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 788 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
789
839 if (recalc_y) 790 if (recalc_y)
840 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 791 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
841 792
842 ncol = width / fwidth; 793 ncol = width / fwidth;
843 nrow = height / fheight; 794 nrow = height / fheight;
844 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
845 ncol, nrow, szHint.width,
846 szHint.height));
847 return;
848} 795}
849 796
850/*----------------------------------------------------------------------*/ 797/*----------------------------------------------------------------------*/
851/* 798/*
852 * Tell the teletype handler what size the window is. 799 * Tell the teletype handler what size the window is.
853 * Called after a window size change. 800 * Called after a window size change.
854 */ 801 */
855void 802void
856rxvt_term::tt_winch () 803rxvt_term::tt_winch ()
857{ 804{
858 if (pty.pty < 0) 805 if (pty->pty < 0)
859 return; 806 return;
860 807
861 struct winsize ws; 808 struct winsize ws;
862 809
863 ws.ws_col = ncol; 810 ws.ws_col = ncol;
864 ws.ws_row = nrow; 811 ws.ws_row = nrow;
865 ws.ws_xpixel = width; 812 ws.ws_xpixel = width;
866 ws.ws_ypixel = height; 813 ws.ws_ypixel = height;
867 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 814 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
868 815
869#if 0 816#if 0
870 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 817 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
871 if (cmd_pid) /* force through to the command */ 818 if (cmd_pid) /* force through to the command */
872 kill (-cmd_pid, SIGWINCH); 819 kill (-cmd_pid, SIGWINCH);
… …
904 delete fontset[0]; 851 delete fontset[0];
905 fontset[0] = fs; 852 fontset[0] = fs;
906 853
907 prop = (*fs)[1]->properties (); 854 prop = (*fs)[1]->properties ();
908 prop.height += lineSpace; 855 prop.height += lineSpace;
856
909 fs->set_prop (prop); 857 fs->set_prop (prop, false);
910 858
911 fwidth = prop.width; 859 fwidth = prop.width;
912 fheight = prop.height; 860 fheight = prop.height;
913 fbase = (*fs)[1]->ascent; 861 fbase = prop.ascent;
914 862
915 for (int style = 1; style < 4; style++) 863 for (int style = 1; style < 4; style++)
916 { 864 {
917#if ENABLE_STYLES 865#if ENABLE_STYLES
918 const char *res = rs[Rs_font + style]; 866 const char *res = rs[Rs_font + style];
… …
923 { 871 {
924 fontset[style] = fs = new rxvt_fontset (this); 872 fontset[style] = fs = new rxvt_fontset (this);
925 rxvt_fontprop prop2 = prop; 873 rxvt_fontprop prop2 = prop;
926 874
927 if (res) 875 if (res)
928 prop2.weight = prop2.slant = rxvt_fontprop::unset; 876 {
877 fs->populate (res);
878 fs->set_prop (prop2, false);
879 }
929 else 880 else
930 { 881 {
931 res = fontset[0]->fontdesc; 882 fs->populate (fontset[0]->fontdesc);
932 883
933 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 884 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
934 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 885 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
886
887 fs->set_prop (prop2, true);
935 } 888 }
936 889
937 fs->populate (res);
938 fs->set_prop (prop2);
939 } 890 }
940#else 891#else
941 fontset[style] = fontset[0]; 892 fontset[style] = fontset[0];
942#endif 893#endif
943 } 894 }
… …
952 return true; 903 return true;
953} 904}
954 905
955void rxvt_term::set_string_property (Atom prop, const char *str, int len) 906void rxvt_term::set_string_property (Atom prop, const char *str, int len)
956{ 907{
957 XChangeProperty (display->display, parent[0], 908 XChangeProperty (dpy, parent[0],
958 prop, XA_STRING, 8, PropModeReplace, 909 prop, XA_STRING, 8, PropModeReplace,
959 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 910 (const unsigned char *)str, len >= 0 ? len : strlen (str));
960} 911}
961 912
962void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 913void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
963{ 914{
964 wchar_t *ws = rxvt_mbstowcs (str, len); 915 wchar_t *ws = rxvt_mbstowcs (str, len);
965 char *s = rxvt_wcstoutf8 (ws); 916 char *s = rxvt_wcstoutf8 (ws);
966 917
967 XChangeProperty (display->display, parent[0], 918 XChangeProperty (dpy, parent[0],
968 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 919 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
969 (const unsigned char *)s, strlen (s)); 920 (const unsigned char *)s, strlen (s));
970 921
971 free (s); 922 free (s);
972 free (ws); 923 free (ws);
… …
997void 948void
998rxvt_term::set_window_color (int idx, const char *color) 949rxvt_term::set_window_color (int idx, const char *color)
999{ 950{
1000 rxvt_color xcol; 951 rxvt_color xcol;
1001 int i; 952 int i;
1002 953
1003 if (color == NULL || *color == '\0') 954 if (color == NULL || *color == '\0')
1004 return; 955 return;
956
957 color = strdup (color);
958 allocated.push_back ((void *)color);
959 rs[Rs_color + idx] = color;
1005 960
1006 /* handle color aliases */ 961 /* handle color aliases */
1007 if (isdigit (*color)) 962 if (isdigit (*color))
1008 { 963 {
1009 i = atoi (color); 964 i = atoi (color);
1010 965
1011 if (i >= 8 && i <= 15) 966 if (i >= 8 && i <= 15)
1012 { /* bright colors */ 967 { /* bright colors */
1013 i -= 8; 968 i -= 8;
1014# ifndef NO_BRIGHTCOLOR
1015 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 969 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1016 SET_PIXCOLOR (idx);
1017 goto done; 970 goto done;
1018# endif
1019 } 971 }
1020 972
1021 if (i >= 0 && i <= 7) 973 if (i >= 0 && i <= 7)
1022 { /* normal colors */ 974 { /* normal colors */
1023 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 975 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1024 SET_PIXCOLOR (idx);
1025 goto done; 976 goto done;
1026 } 977 }
1027 } 978 }
1028 979
1029 if (!rXParseAllocColor (&xcol, color)) 980 set_color (xcol, color);
1030 return;
1031
1032 /* XStoreColor (display->display, display->cmap, XColor*); */
1033 981
1034 /* 982 /*
1035 * FIXME: should free colors here, but no idea how to do it so instead, 983 * FIXME: should free colors here, but no idea how to do it so instead,
1036 * so just keep gobbling up the colormap 984 * so just keep gobbling up the colormap
1037 */ 985 */
1038# if 0
1039 for (i = Color_Black; i <= Color_White; i++)
1040 if (pix_colors[idx] == pix_colors[i])
1041 break;
1042 if (i > Color_White)
1043 {
1044 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1045 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1046 DisplayPlanes (display->display, display->screen));
1047 }
1048# endif
1049 986
1050 pix_colors_focused[idx] = xcol; 987 pix_colors_focused[idx] = xcol;
1051 SET_PIXCOLOR (idx);
1052 988
1053 /* XSetWindowAttributes attr; */ 989 /* XSetWindowAttributes attr; */
1054 /* Cursor cursor; */ 990 /* Cursor cursor; */
1055done: 991done:
1056
1057#if OFF_FOCUS_FADING
1058 if (rs[Rs_fade])
1059 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1060#endif
1061
1062 /*TODO: handle Color_BD, scrollbar background, etc. */ 992 /*TODO: handle Color_BD, scrollbar background, etc. */
1063 993
994 update_fade_color (idx);
1064 recolour_cursor (); 995 recolour_cursor ();
1065 scr_recolour (); 996 scr_recolour ();
1066} 997}
1067 998
1068#else 999#else
… …
1070#endif /* XTERM_COLOR_CHANGE */ 1001#endif /* XTERM_COLOR_CHANGE */
1071 1002
1072void 1003void
1073rxvt_term::recolour_cursor () 1004rxvt_term::recolour_cursor ()
1074{ 1005{
1075 XColor xcol[2]; 1006 XColor fg, bg;
1076 1007
1077 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1008 (ISSET_PIXCOLOR (Color_pointer_fg)
1078 ? pix_colors_focused[Color_pointer_fg] 1009 ? pix_colors_focused[Color_pointer_fg]
1079 : pix_colors_focused[Color_fg]; 1010 : pix_colors_focused[Color_fg]).get (fg);
1011
1080 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1012 (ISSET_PIXCOLOR (Color_pointer_bg)
1081 ? pix_colors_focused[Color_pointer_bg] 1013 ? pix_colors_focused[Color_pointer_bg]
1082 : pix_colors_focused[Color_bg]; 1014 : pix_colors_focused[Color_bg]).get (bg);
1083 1015
1084 XQueryColors (display->display, display->cmap, xcol, 2); 1016 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1085 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1086} 1017}
1087 1018
1088/*----------------------------------------------------------------------*/ 1019/*----------------------------------------------------------------------*/
1089/* 1020/*
1090 * find if fg/bg matches any of the normal (low-intensity) colors 1021 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1094{ 1025{
1095 unsigned int i; 1026 unsigned int i;
1096 const char *xpmb = "\0"; 1027 const char *xpmb = "\0";
1097 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1028 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1098 1029
1099 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1100 strcpy (fstr, "default"); 1030 strcpy (fstr, "default");
1101 strcpy (bstr, "default"); 1031 strcpy (bstr, "default");
1102 for (i = Color_Black; i <= Color_White; i++) 1032 for (i = Color_Black; i <= Color_White; i++)
1103 if (pix_colors[Color_fg] == pix_colors[i]) 1033 if (pix_colors[Color_fg] == pix_colors[i])
1104 { 1034 {
… …
1108 1038
1109 for (i = Color_Black; i <= Color_White; i++) 1039 for (i = Color_Black; i <= Color_White; i++)
1110 if (pix_colors[Color_bg] == pix_colors[i]) 1040 if (pix_colors[Color_bg] == pix_colors[i])
1111 { 1041 {
1112 sprintf (bstr, "%d", (i - Color_Black)); 1042 sprintf (bstr, "%d", (i - Color_Black));
1113#ifdef XPM_BACKGROUND 1043#ifdef BG_IMAGE_FROM_FILE
1114 xpmb = "default;"; 1044 xpmb = "default;";
1115#endif 1045#endif
1116 break; 1046 break;
1117 } 1047 }
1118 1048
1119 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1120} 1050}
1121 1051
1122/*----------------------------------------------------------------------*/ 1052/*----------------------------------------------------------------------*/
1123 1053
1124int 1054bool
1125rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1055rxvt_term::set_color (rxvt_color &color, const char *name)
1126{ 1056{
1127 if (!screen_in_out->set (display, colour)) 1057 if (color.set (this, name))
1128 {
1129 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1130 return false;
1131 }
1132
1133 return true; 1058 return true;
1059
1060 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1061 return false;
1062}
1063
1064void
1065rxvt_term::alias_color (int dst, int src)
1066{
1067 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1134} 1068}
1135 1069
1136/* -------------------------------------------------------------------- * 1070/* -------------------------------------------------------------------- *
1137 * - WINDOW RESIZING - * 1071 * - WINDOW RESIZING - *
1138 * -------------------------------------------------------------------- */ 1072 * -------------------------------------------------------------------- */
1139void 1073void
1140rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1074rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1141{ 1075{
1142 int fix_screen; 1076 int fix_screen;
1143 int old_width = szHint.width, old_height = szHint.height; 1077 int old_width = szHint.width;
1144 dDisp; 1078 int old_height = szHint.height;
1145 1079
1146 window_calc (newwidth, newheight); 1080 window_calc (newwidth, newheight);
1081
1082 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1147 XSetWMNormalHints (disp, parent[0], &szHint); 1083 XSetWMNormalHints (dpy, parent[0], &szHint);
1148 1084
1149 if (!ignoreparent) 1085 if (!ignoreparent)
1150 { 1086 {
1151#ifdef SMART_RESIZE 1087#ifdef SMART_RESIZE
1152 /* 1088 /*
… …
1156 int x, y, x1, y1; 1092 int x, y, x1, y1;
1157 int dx, dy; 1093 int dx, dy;
1158 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1094 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1159 Window unused_cr; 1095 Window unused_cr;
1160 1096
1161 XTranslateCoordinates (disp, parent[0], display->root, 1097 XTranslateCoordinates (dpy, parent[0], display->root,
1162 0, 0, &x, &y, &unused_cr); 1098 0, 0, &x, &y, &unused_cr);
1163 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1099 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1164 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1100 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1165 /* 1101 /*
1166 * if display->root isn't the parent window, a WM will probably have offset 1102 * if display->root isn't the parent window, a WM will probably have offset
1167 * our position for handles and decorations. Counter it 1103 * our position for handles and decorations. Counter it
1168 */ 1104 */
… …
1170 { 1106 {
1171 x -= x1; 1107 x -= x1;
1172 y -= y1; 1108 y -= y1;
1173 } 1109 }
1174 1110
1175 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1111 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1176 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1112 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1177 dx = old_width - szHint.width; 1113 dx = old_width - szHint.width;
1178 dy = old_height - szHint.height; 1114 dy = old_height - szHint.height;
1179 1115
1180 /* Check position of the center of the window */ 1116 /* Check position of the center of the window */
1181 if (x < x1) /* left half */ 1117 if (x < x1) /* left half */
1182 dx = 0; 1118 dx = 0;
… …
1185 if (y < y1) /* top half */ 1121 if (y < y1) /* top half */
1186 dy = 0; 1122 dy = 0;
1187 else if (y == y1) /* exact center */ 1123 else if (y == y1) /* exact center */
1188 dy /= 2; 1124 dy /= 2;
1189 1125
1190 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1126 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1191 szHint.width, szHint.height); 1127 szHint.width, szHint.height);
1192#else 1128#else
1193 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1129 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1194#endif 1130#endif
1195 } 1131 }
1196 1132
1197 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1198 1134
1199 if (fix_screen || newwidth != old_width || newheight != old_height) 1135 if (fix_screen || newwidth != old_width || newheight != old_height)
1200 { 1136 {
1201 if (scrollbar_visible ()) 1137 if (scrollBar.state)
1202 { 1138 {
1203 XMoveResizeWindow (disp, scrollBar.win, 1139 XMoveResizeWindow (dpy, scrollBar.win,
1204 window_sb_x, 0, 1140 window_sb_x, 0,
1205 scrollbar_TotalWidth (), szHint.height); 1141 scrollbar_TotalWidth (), szHint.height);
1206 resize_scrollbar (); 1142 resize_scrollbar ();
1207 } 1143 }
1208 1144
1209 if (menubar_visible ())
1210 XMoveResizeWindow (disp, menuBar.win,
1211 window_vt_x, 0,
1212 TermWin_TotalWidth (), menuBar_TotalHeight ());
1213
1214 XMoveResizeWindow (disp, vt, 1145 XMoveResizeWindow (dpy, vt,
1215 window_vt_x, window_vt_y, 1146 window_vt_x, window_vt_y,
1216 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1147 width, height);
1148
1149#ifdef HAVE_BG_PIXMAP
1150 if (bgPixmap.window_size_sensitive ())
1151 update_background ();
1152#endif
1217 1153
1218 scr_clear (); 1154 scr_clear ();
1219#ifdef XPM_BACKGROUND
1220 resize_pixmap ();
1221#endif
1222 } 1155 }
1223 1156
1224 if (fix_screen || old_height == 0) 1157 if (fix_screen || old_height == 0)
1225 {
1226 int curr_screen = -1;
1227 int old_ncol = prev_ncol;
1228
1229 /* scr_reset only works on the primary screen */
1230 if (old_height) /* this is not the first time through */
1231 {
1232 unsigned int ocol = ncol;
1233 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1234 curr_screen = scr_change_screen (PRIMARY);
1235 ncol = ocol;
1236 }
1237
1238 scr_reset (); 1158 scr_reset ();
1239 1159
1240 if (curr_screen >= 0) /* this is not the first time through */ 1160 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1241 { 1161 //scr_touch (false);
1242 scr_change_screen (curr_screen);
1243 selection_check (old_ncol != ncol ? 4 : 0);
1244 }
1245 }
1246 1162
1247 old_width = szHint.width; 1163#ifdef HAVE_BG_PIXMAP
1248 old_height = szHint.height; 1164// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1249 1165// if (bgPixmap.pixmap)
1250#ifdef XPM_BACKGROUND
1251 if (pixmap)
1252 scr_touch (false); 1166// scr_touch (false);
1253#endif 1167#endif
1254 1168
1255#ifdef USE_XIM 1169#ifdef USE_XIM
1256 IMSetStatusPosition (); 1170 IMSetPosition ();
1257#endif 1171#endif
1258} 1172}
1259 1173
1260/* 1174/*
1261 * Set the width/height of the vt window in characters. Units are pixels. 1175 * Set the width/height of the vt window in characters. Units are pixels.
… …
1266{ 1180{
1267 XWindowAttributes wattr; 1181 XWindowAttributes wattr;
1268 1182
1269 if (newwidth == 0 || newheight == 0) 1183 if (newwidth == 0 || newheight == 0)
1270 { 1184 {
1271 XGetWindowAttributes (display->display, display->root, &wattr); 1185 XGetWindowAttributes (dpy, display->root, &wattr);
1272 1186
1273 if (newwidth == 0) 1187 if (newwidth == 0)
1274 newwidth = wattr.width - szHint.base_width; 1188 newwidth = wattr.width - szHint.base_width;
1275 if (newheight == 0) 1189 if (newheight == 0)
1276 newheight = wattr.height - szHint.base_height; 1190 newheight = wattr.height - szHint.base_height;
… …
1290#ifdef USE_XIM 1204#ifdef USE_XIM
1291 1205
1292void 1206void
1293rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1207rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1294{ 1208{
1295 fg = pix_colors[Color_fg]; 1209 fg = pix_colors [Color_fg];
1296 bg = pix_colors[Color_bg]; 1210 bg = pix_colors [Color_bg];
1297} 1211}
1298 1212
1299void 1213void
1300rxvt_term::im_set_size (XRectangle &size) 1214rxvt_term::im_set_size (XRectangle &size)
1301{ 1215{
… …
1338 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1252 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1339 1253
1340 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1254 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1341 *p = '\0'; 1255 *p = '\0';
1342 1256
1343 atom = XInternAtom (display->display, server, False); 1257 atom = XInternAtom (dpy, server, False);
1344 win = XGetSelectionOwner (display->display, atom); 1258 win = XGetSelectionOwner (dpy, atom);
1345 1259
1346 if (win != None) 1260 if (win != None)
1347 return True; 1261 return True;
1348 } 1262 }
1349 1263
… …
1356 XPoint nspot; 1270 XPoint nspot;
1357 XVaNestedList preedit_attr; 1271 XVaNestedList preedit_attr;
1358 1272
1359 if (!Input_Context 1273 if (!Input_Context
1360 || !focus 1274 || !focus
1361 || !(input_style & XIMPreeditPosition)) 1275 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1362 return; 1276 return;
1363 1277
1364 im_set_position (nspot); 1278 im_set_position (nspot);
1365 1279
1366 if (nspot.x == spot.x && nspot.y == spot.y) 1280 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1385 input_method = 0; 1299 input_method = 0;
1386 } 1300 }
1387 1301
1388 Input_Context = 0; 1302 Input_Context = 0;
1389} 1303}
1304
1305#ifdef ENABLE_XIM_ONTHESPOT
1306
1307static void
1308xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1309{
1310 ((rxvt_term *)client_data)->make_current ();
1311 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1312}
1313
1314static void
1315xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1316{
1317 ((rxvt_term *)client_data)->make_current ();
1318 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1319}
1320
1321static void
1322xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1323{
1324 rxvt_term *term = (rxvt_term *)client_data;
1325 XIMText *text = call_data->text;
1326
1327 term->make_current ();
1328
1329 if (text)
1330 {
1331 void *str;
1332
1333 if (!text->encoding_is_wchar && text->string.multi_byte)
1334 {
1335 // of course, X makes it ugly again
1336 if (term->rs[Rs_imLocale])
1337 SET_LOCALE (term->rs[Rs_imLocale]);
1338
1339 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1340 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1341
1342 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->locale);
1344 }
1345 else
1346 str = (void *)text->string.wide_char;
1347
1348 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349 DT_INT, call_data->caret,
1350 DT_INT, call_data->chg_first,
1351 DT_INT, call_data->chg_length,
1352 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1353 DT_WCS_LEN, str, str ? (int)text->length : 0,
1354 DT_END));
1355 }
1356 else
1357 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1358 DT_INT, call_data->caret,
1359 DT_INT, call_data->chg_first,
1360 DT_INT, call_data->chg_length,
1361 DT_END));
1362}
1363
1364#if 0
1365static void
1366xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1367{
1368 ((rxvt_term *)client_data)->make_current ();
1369 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1370 DT_INT, call_data->position,
1371 DT_INT, call_data->direction,
1372 DT_INT, call_data->style,
1373 DT_END));
1374}
1375#endif
1376
1377#endif
1390 1378
1391/* 1379/*
1392 * Try to open a XIM with the current modifiers, then see if we can 1380 * Try to open a XIM with the current modifiers, then see if we can
1393 * open a suitable preedit type 1381 * open a suitable preedit type
1394 */ 1382 */
… …
1401 XRectangle rect, status_rect, needed_rect; 1389 XRectangle rect, status_rect, needed_rect;
1402 unsigned long fg, bg; 1390 unsigned long fg, bg;
1403 const char *p; 1391 const char *p;
1404 char **s; 1392 char **s;
1405 XIMStyles *xim_styles; 1393 XIMStyles *xim_styles;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 XIMCallback xcb[4];
1396#endif
1397
1398 set_environ (envv);
1406 1399
1407 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1400 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1408 return false; 1401 return false;
1409 1402
1410 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1411 input_method = display->get_xim (locale, modifiers); 1403 input_method = display->get_xim (locale, modifiers);
1412 if (input_method == NULL) 1404 if (input_method == NULL)
1413 return false; 1405 return false;
1414 1406
1415 xim = input_method->xim; 1407 xim = input_method->xim;
… …
1435 s = rxvt_splitcommastring (p); 1427 s = rxvt_splitcommastring (p);
1436 1428
1437 for (i = found = 0; !found && s[i]; i++) 1429 for (i = found = 0; !found && s[i]; i++)
1438 { 1430 {
1439 if (!strcmp (s[i], "OverTheSpot")) 1431 if (!strcmp (s[i], "OverTheSpot"))
1440 input_style = (XIMPreeditPosition | XIMStatusNothing); 1432 input_style = XIMPreeditPosition | XIMStatusNothing;
1441 else if (!strcmp (s[i], "OffTheSpot")) 1433 else if (!strcmp (s[i], "OffTheSpot"))
1442 input_style = (XIMPreeditArea | XIMStatusArea); 1434 input_style = XIMPreeditArea | XIMStatusArea;
1443 else if (!strcmp (s[i], "Root")) 1435 else if (!strcmp (s[i], "Root"))
1444 input_style = (XIMPreeditNothing | XIMStatusNothing); 1436 input_style = XIMPreeditNothing | XIMStatusNothing;
1445 else if (!strcmp (s[i], "None")) 1437 else if (!strcmp (s[i], "None"))
1446 input_style = (XIMPreeditNone | XIMStatusNone); 1438 input_style = XIMPreeditNone | XIMStatusNone;
1439#ifdef ENABLE_XIM_ONTHESPOT
1440 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1441 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1442#endif
1443 else
1444 input_style = XIMPreeditNothing | XIMStatusNothing;
1447 1445
1448 for (j = 0; j < xim_styles->count_styles; j++) 1446 for (j = 0; j < xim_styles->count_styles; j++)
1449 if (input_style == xim_styles->supported_styles[j]) 1447 if (input_style == xim_styles->supported_styles[j])
1450 { 1448 {
1451 rxvt_freecommastring (s); 1449 rxvt_freecommastring (s);
… …
1489 "*", 1487 "*",
1490 fheight, 1488 fheight,
1491 fheight + 1, fheight - 1, 1489 fheight + 1, fheight - 1,
1492 fheight - 2, fheight + 2); 1490 fheight - 2, fheight + 2);
1493 1491
1494 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1492 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1495 &missing_charset_list, &missing_charset_count, &def_string); 1493 &missing_charset_list, &missing_charset_count, &def_string);
1496 1494
1497 if (missing_charset_list) 1495 if (missing_charset_list)
1498 XFreeStringList (missing_charset_list); 1496 XFreeStringList (missing_charset_list);
1499 1497
… …
1540 XNBackground, bg, 1538 XNBackground, bg,
1541 XNArea, &status_rect, 1539 XNArea, &status_rect,
1542 XNFontSet, fs, 1540 XNFontSet, fs,
1543 NULL); 1541 NULL);
1544 } 1542 }
1543#if ENABLE_XIM_ONTHESPOT
1544 else if (input_style & XIMPreeditCallbacks)
1545 {
1546 im_set_position (spot);
1547
1548 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1549 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1550 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1551# if 0
1552 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1553# endif
1554
1555 preedit_attr = XVaCreateNestedList (0,
1556 XNSpotLocation, &spot,
1557 XNPreeditStartCallback, &xcb[0],
1558 XNPreeditDoneCallback , &xcb[1],
1559 XNPreeditDrawCallback , &xcb[2],
1560# if 0
1561 XNPreeditCaretCallback, &xcb[3],
1562# endif
1563 NULL);
1564 }
1565#endif
1545 1566
1546 Input_Context = XCreateIC (xim, 1567 Input_Context = XCreateIC (xim,
1547 XNInputStyle, input_style, 1568 XNInputStyle, input_style,
1548 XNClientWindow, vt, 1569 XNClientWindow, vt,
1549 XNFocusWindow, parent[0], 1570 XNFocusWindow, parent[0],
… …
1551 preedit_attr, 1572 preedit_attr,
1552 status_attr ? XNStatusAttributes : NULL, 1573 status_attr ? XNStatusAttributes : NULL,
1553 status_attr, NULL); 1574 status_attr, NULL);
1554 1575
1555 if (preedit_attr) XFree (preedit_attr); 1576 if (preedit_attr) XFree (preedit_attr);
1556 if (status_attr) XFree (status_attr); 1577 if (status_attr) XFree (status_attr);
1557 if (fs) XFreeFontSet (display->display, fs); 1578 if (fs) XFreeFontSet (dpy, fs);
1558 1579
1559 if (Input_Context == NULL) 1580 if (Input_Context == NULL)
1560 { 1581 {
1561 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1582 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1562 im_destroy (); 1583 im_destroy ();
1563 return false; 1584 return false;
1564 } 1585 }
1565 1586
1566 if (input_style & XIMPreeditArea) 1587#if 0
1588 // unfortunately, only the focus window is used by XIM, hard to fix
1589 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1590 vt_select_input ();
1591#endif
1592
1567 IMSetStatusPosition (); 1593 IMSetPosition ();
1568 1594
1569 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1570 return true; 1595 return true;
1571} 1596}
1572 1597
1573void 1598void
1574rxvt_term::im_cb () 1599rxvt_term::im_cb ()
… …
1576 int i; 1601 int i;
1577 const char *p; 1602 const char *p;
1578 char **s; 1603 char **s;
1579 char buf[IMBUFSIZ]; 1604 char buf[IMBUFSIZ];
1580 1605
1581 SET_R (this); 1606 make_current ();
1582 1607
1583 im_destroy (); 1608 im_destroy ();
1584 1609
1585 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1586 if (Input_Context) 1610 if (Input_Context)
1587 return; 1611 return;
1588 1612
1589#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1613#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1590 if (rs[Rs_imLocale]) 1614 if (rs[Rs_imLocale])
… …
1632 SET_LOCALE (locale); 1656 SET_LOCALE (locale);
1633#endif 1657#endif
1634} 1658}
1635 1659
1636void 1660void
1637rxvt_term::IMSetStatusPosition () 1661rxvt_term::IMSetPosition ()
1638{ 1662{
1639 XRectangle preedit_rect, status_rect, *needed_rect; 1663 XRectangle preedit_rect, status_rect, *needed_rect;
1640 XVaNestedList preedit_attr, status_attr; 1664 XVaNestedList preedit_attr, status_attr;
1641 1665
1642 if (!Input_Context 1666 if (!Input_Context
1643 || !focus 1667 || !focus
1644 || !(input_style & XIMPreeditArea) 1668 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1645 || !IMisRunning ()) 1669 || !IMisRunning ())
1646 return; 1670 return;
1647 1671
1672 if (input_style & XIMPreeditPosition)
1673 {
1674 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676
1677 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL);
1679 }
1680 else
1681 {
1648 /* Getting the necessary width of preedit area */ 1682 /* Getting the necessary width of preedit area */
1649 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1683 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1650 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1684 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1651 XFree (status_attr); 1685 XFree (status_attr);
1652 1686
1653 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1687 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1654 XFree (needed_rect); 1688 XFree (needed_rect);
1655 1689
1656 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1690 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1657 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1691 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1658 1692
1659 XSetICValues (Input_Context, 1693 XSetICValues (Input_Context,
1660 XNPreeditAttributes, preedit_attr, 1694 XNPreeditAttributes, preedit_attr,
1661 XNStatusAttributes, status_attr, NULL); 1695 XNStatusAttributes, status_attr,
1696 NULL);
1662 1697
1698 XFree (status_attr);
1699 }
1700
1663 XFree (preedit_attr); 1701 XFree (preedit_attr);
1664 XFree (status_attr);
1665} 1702}
1666#endif /* USE_XIM */ 1703#endif /* USE_XIM */
1667 1704
1668/*----------------------------------------------------------------------*/ 1705void
1669rxvt_t rxvt_current_term; 1706rxvt_term::get_window_origin (int &x, int &y)
1707{
1708 Window cr;
1709 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1710/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1711}
1712
1713Pixmap
1714rxvt_term::get_pixmap_property (int prop_id)
1715{
1716 if (prop_id > 0 && prop_id < NUM_XA)
1717 if (xa[prop_id])
1718 {
1719 int aformat;
1720 unsigned long nitems, bytes_after;
1721 Atom atype;
1722 unsigned char *prop = NULL;
1723 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1724 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725 &nitems, &bytes_after, &prop);
1726 if (result == Success && prop && atype == XA_PIXMAP)
1727 {
1728 return *(Pixmap *)prop;
1729 }
1730 }
1731 return None;
1732}
1733
1734#ifdef HAVE_BG_PIXMAP
1735int
1736rxvt_term::update_background ()
1737{
1738 bgPixmap.invalidate ();
1739
1740 /* no chance of real time refresh if we are blurring ! */
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1742 bgPixmap.render ();
1743 else
1744 {
1745 update_background_ev.stop ();
1746 if (!bgPixmap.need_client_side_rendering())
1747 update_background_ev.start (NOW + .05);
1748 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749 update_background_ev.start (NOW + .2); /* very slow !!! */
1750 else
1751 update_background_ev.start (NOW + .07);
1752 }
1753 return 0;
1754}
1755
1756void
1757rxvt_term::update_background_cb (time_watcher &w)
1758{
1759 bgPixmap.render ();
1760}
1761
1762#endif /* HAVE_BG_PIXMAP */
1670 1763
1671/*----------------------- end-of-file (C source) -----------------------*/ 1764/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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