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.42 by pcg, Sun Feb 22 10:38:11 2004 UTC vs.
Revision 1.54 by pcg, Mon Mar 15 00:08:11 2004 UTC

… …
56 STRNCPY (curlocale, locale, 128); 56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale); 57 setlocale (LC_CTYPE, curlocale);
58 } 58 }
59} 59}
60 60
61#if ENABLE_COMBINING
62class rxvt_composite_vec rxvt_composite;
63
64text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
65{
66 compose_char *cc;
67
68 // break compose chains, as stupid readline really likes to duplicate
69 // composing characters for some reason near the end of a line.
70 cc = (*this)[c1];
71 while (cc)
72 {
73 if (cc->c2 == c2) return c1;
74 cc = (*this)[cc->c1];
75 }
76
77 // check to see wether this combination already exists otherwise
78 for (cc = v.end (); cc-- > v.begin (); )
79 {
80 if (cc->c1 == c1 && cc->c2 == c2)
81 return COMPOSE_LO + (cc - v.begin ());
82 }
83
84 // allocate a new combination
85 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
86 {
87 static int seen;
88
89 if (!seen++)
90 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
91
92 return REPLACEMENT_CHAR;
93 }
94
95 v.push_back (compose_char (c1, c2));
96
97 return v.size () - 1 + COMPOSE_LO;
98}
99
100int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
101{
102 compose_char *cc = (*this)[c];
103
104 if (!cc)
105 {
106 if (r) *r = c;
107 return 1;
108 }
109
110 int len = expand (cc->c1, r);
111
112 if (r) r += len;
113
114 if (cc->c2 != NOCHAR)
115 {
116 len++;
117 if (r) *r++ = cc->c2;
118 }
119
120 return len;
121
122}
123#endif
124
61void * 125void *
62rxvt_term::operator new (size_t s) 126rxvt_term::operator new (size_t s)
63{ 127{
64 void *p = malloc (s); 128 void *p = malloc (s);
65 129
… …
80 vt_ev (this, &rxvt_term::x_cb), 144 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS 145#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb), 146 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif 147#endif
84#ifdef MENUBAR 148#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb), fixme 149 menubar_ev (this, &rxvt_term::x_cb),
86#endif 150#endif
87#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif 153#endif
90#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
… …
117#endif 181#endif
118 182
119 delete TermWin.fontset; 183 delete TermWin.fontset;
120 184
121 if (display) 185 if (display)
186 {
187#if defined(MENUBAR) && (MENUBAR_MAX > 1)
188 delete menuBar.drawable;
189 //if (menuBar.win)
190 // XDestroyWindow (display->display, menuBar.win);
191#endif
192 delete TermWin.drawable;
193 // destroy all windows
122 if (TermWin.parent[0]) 194 if (TermWin.parent[0])
123 XDestroyWindow (display->display, TermWin.parent[0]); 195 XDestroyWindow (display->display, TermWin.parent[0]);
196 }
124 197
125 // TODO: free pixcolours, colours should become part of rxvt_display 198 // TODO: free pixcolours, colours should become part of rxvt_display
126 199
127 delete PixColors; 200 delete PixColors;
128 201
… …
249 322
250 const char **cmd_argv = init_resources (argc, argv); 323 const char **cmd_argv = init_resources (argc, argv);
251 324
252 set_locale (""); 325 set_locale ("");
253 326
254#if (MENUBAR_MAX) 327#if MENUBAR_MAX
255 menubar_read (rs[Rs_menu]); 328 menubar_read (rs[Rs_menu]);
256#endif 329#endif
257#ifdef HAVE_SCROLLBARS 330#ifdef HAVE_SCROLLBARS
258 if (Options & Opt_scrollBar) 331 if (Options & Opt_scrollBar)
259 scrollBar.setIdle (); /* set existence for size calculations */ 332 scrollBar.setIdle (); /* set existence for size calculations */
… …
272#ifdef HAVE_SCROLLBARS 345#ifdef HAVE_SCROLLBARS
273 if (Options & Opt_scrollBar) 346 if (Options & Opt_scrollBar)
274 resize_scrollbar (); /* create and map scrollbar */ 347 resize_scrollbar (); /* create and map scrollbar */
275#endif 348#endif
276#if (MENUBAR_MAX) 349#if (MENUBAR_MAX)
277 if (menubar_visible (r)) 350 if (menubar_visible ())
278 XMapWindow (display->display, menuBar.win); 351 XMapWindow (display->display, menuBar.win);
279#endif 352#endif
280#ifdef TRANSPARENT 353#ifdef TRANSPARENT
281 if (Options & Opt_transparent) 354 if (Options & Opt_transparent)
282 { 355 {
… …
376 449
377 p = malloc (size); 450 p = malloc (size);
378 if (p) 451 if (p)
379 return p; 452 return p;
380 453
381 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 454 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
382 rxvt_clean_exit (); 455 rxvt_clean_exit ();
383 exit (EXIT_FAILURE); 456 exit (EXIT_FAILURE);
384 /* NOTREACHED */ 457 /* NOTREACHED */
385} 458}
386 459
… …
392 465
393 p = calloc (number, size); 466 p = calloc (number, size);
394 if (p) 467 if (p)
395 return p; 468 return p;
396 469
397 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 470 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
398 rxvt_clean_exit (); 471 rxvt_clean_exit ();
399 exit (EXIT_FAILURE); 472 exit (EXIT_FAILURE);
400 /* NOTREACHED */ 473 /* NOTREACHED */
401} 474}
402 475
… …
411 else 484 else
412 p = malloc (size); 485 p = malloc (size);
413 if (p) 486 if (p)
414 return p; 487 return p;
415 488
416 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 489 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
417 rxvt_clean_exit (); 490 rxvt_clean_exit ();
418 exit (EXIT_FAILURE); 491 exit (EXIT_FAILURE);
419 /* NOTREACHED */ 492 /* NOTREACHED */
420} 493}
421 494
… …
613 else 686 else
614 szHint.win_gravity = SouthWestGravity; 687 szHint.win_gravity = SouthWestGravity;
615 } 688 }
616 } 689 }
617 } 690 }
691
618 /* TODO: BOUNDS */ 692 /* TODO: BOUNDS */
619 TermWin.width = TermWin.ncol * TermWin.fwidth; 693 TermWin.width = TermWin.ncol * TermWin.fwidth;
620 TermWin.height = TermWin.nrow * TermWin.fheight; 694 TermWin.height = TermWin.nrow * TermWin.fheight;
621 max_width = MAX_COLS * TermWin.fwidth; 695 max_width = MAX_COLS * TermWin.fwidth;
622 max_height = MAX_ROWS * TermWin.fheight; 696 max_height = MAX_ROWS * TermWin.fheight;
… …
730 } 804 }
731 else 805 else
732 { 806 {
733 rxvt_fontset *fs = new rxvt_fontset (this); 807 rxvt_fontset *fs = new rxvt_fontset (this);
734 808
735 if (fs && fs->populate (fontname)) 809 if (fs && fs->populate (fontname ? fontname : "fixed"))
736 { 810 {
737 delete TermWin.fontset; 811 delete TermWin.fontset;
738 TermWin.fontset = fs; 812 TermWin.fontset = fs;
739 TermWin.fwidth = fs->base_font ()->width; 813 TermWin.fwidth = fs->base_font ()->width;
740 TermWin.fheight = fs->base_font ()->height; 814 TermWin.fheight = fs->base_font ()->height;
741 TermWin.fbase = fs->base_font ()->ascent; 815 TermWin.fbase = fs->base_font ()->ascent;
742 816
743 // TODO: screen needs to be told about new fonts
744
745 if (TermWin.parent[0]) 817 if (TermWin.parent[0])
746 { 818 {
747 resize_all_windows (0, 0, 0); 819 resize_all_windows (0, 0, 0);
748 scr_remap_chars (); 820 scr_remap_chars ();
749 scr_touch (true); 821 scr_touch (true);
… …
769rxvt_term::set_title (const char *str) 841rxvt_term::set_title (const char *str)
770{ 842{
771#ifndef SMART_WINDOW_TITLE 843#ifndef SMART_WINDOW_TITLE
772 XStoreName (display->display, TermWin.parent[0], str); 844 XStoreName (display->display, TermWin.parent[0], str);
773#else 845#else
774 char *name; 846 char *name;
775 847
776 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 848 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
777 name = NULL; 849 name = NULL;
778 if (name == NULL || STRCMP (name, str)) 850 if (name == NULL || STRCMP (name, str))
779 XStoreName (display->display, TermWin.parent[0], str); 851 XStoreName (display->display, TermWin.parent[0], str);
… …
786rxvt_term::set_iconName (const char *str) 858rxvt_term::set_iconName (const char *str)
787{ 859{
788#ifndef SMART_WINDOW_TITLE 860#ifndef SMART_WINDOW_TITLE
789 XSetIconName (display->display, TermWin.parent[0], str); 861 XSetIconName (display->display, TermWin.parent[0], str);
790#else 862#else
791 char *name; 863 char *name;
792 864
793 if (XGetIconName (display->display, TermWin.parent[0], &name)) 865 if (XGetIconName (display->display, TermWin.parent[0], &name))
794 name = NULL; 866 name = NULL;
795 if (name == NULL || STRCMP (name, str)) 867 if (name == NULL || STRCMP (name, str))
796 XSetIconName (display->display, TermWin.parent[0], str); 868 XSetIconName (display->display, TermWin.parent[0], str);
… …
801 873
802#ifdef XTERM_COLOR_CHANGE 874#ifdef XTERM_COLOR_CHANGE
803void 875void
804rxvt_term::set_window_color (int idx, const char *color) 876rxvt_term::set_window_color (int idx, const char *color)
805{ 877{
806 rxvt_color xcol; 878 rxvt_color xcol;
807 int i; 879 int i;
808 880
809 if (color == NULL || *color == '\0') 881 if (color == NULL || *color == '\0')
810 return; 882 return;
811 883
812 /* handle color aliases */ 884 /* handle color aliases */
… …
1029 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1101 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1030 1102
1031 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1103 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
1032 window_vt_y, TermWin_TotalWidth (), 1104 window_vt_y, TermWin_TotalWidth (),
1033 TermWin_TotalHeight ()); 1105 TermWin_TotalHeight ());
1034 scr_clear (); 1106 scr_clear (height != old_height);
1035#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1036 resize_pixmap (); 1108 resize_pixmap ();
1037#endif 1109#endif
1038 1110
1039 } 1111 }

Diff Legend

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