ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.315 by root, Wed Jun 28 21:17:01 2006 UTC vs.
Revision 1.323 by root, Wed Jul 5 03:01:01 2006 UTC

… …
423 my ($self) = @_; 423 my ($self) = @_;
424 424
425 return if $FOCUS == $self; 425 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
427 427
428 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
429 429
430 $focus->update if $focus; 430 $self->update;
431 $FOCUS->update;
432 431
433 0 432 0
434} 433}
435 434
436sub invoke_focus_out { 435sub invoke_focus_out {
437 my ($self) = @_; 436 my ($self) = @_;
438 437
439 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
440 439
441 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
442 441
443 $focus->update if $focus; #? 442 $self->update;
444 443
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 445 unless $FOCUS;
447 446
448 0 447 0
449} 448}
450 449
451sub grab_focus { 450sub grab_focus {
452 my ($self) = @_; 451 my ($self) = @_;
453 452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 454 $self->emit ("focus_in");
455} 455}
456 456
457sub invoke_mouse_motion { 1 } 457sub invoke_mouse_motion { 1 }
458sub invoke_button_up { 1 } 458sub invoke_button_up { 1 }
… …
1096 1096
1097 if ($self->{has_close_button}) { 1097 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png', 1100 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1101 on_activate => sub { $self->emit ("delete") };
1102 1102
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 } 1104 }
1105 1105
1106 $self 1106 $self
… …
1152 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1153 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1155 if $self->{close_button};
1156 1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1157 1 1165 1
1158} 1166}
1159 1167
1160sub invoke_button_down { 1168sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
… …
1583 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1584 1592
1585 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1587 1595
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1590 1597
1591 delete $self->{size_req}; 1598 delete $self->{size_req};
1592 $self->realloc; 1599 $self->realloc;
1593 $self->update; 1600 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1601 1608
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1610
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1606 1612
1607 delete $self->{size_req}; 1613 delete $self->{size_req};
1608 $self->realloc; 1614 $self->realloc;
1609 $self->update; 1615 $self->update;
… …
1621 1627
1622 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1623 1629
1624 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1632 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1633 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1634
1628 my ($w2, $h2) = $self->{template}->size; 1635 my ($w2, $h2) = $self->{template}->size;
1629 1636
1630 $w = List::Util::max $w, $w2; 1637 $w = List::Util::max $w, $w2;
… …
1654 1661
1655sub set_fontsize { 1662sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1663 my ($self, $fontsize) = @_;
1657 1664
1658 $self->{fontsize} = $fontsize; 1665 $self->{fontsize} = $fontsize;
1666 delete $self->{size_req};
1659 delete $self->{texture}; 1667 delete $self->{texture};
1660 1668
1661 $self->realloc; 1669 $self->realloc;
1662} 1670}
1663 1671
1664sub reconfigure { 1672sub reconfigure {
1665 my ($self) = @_; 1673 my ($self) = @_;
1666 1674
1667 delete $self->{size_req}; 1675 delete $self->{size_req};
1676 delete $self->{texture};
1668 1677
1669 $self->SUPER::reconfigure; 1678 $self->SUPER::reconfigure;
1670} 1679}
1671 1680
1672sub _draw { 1681sub _draw {
1673 my ($self) = @_; 1682 my ($self) = @_;
1674 1683
1675 $self->SUPER::_draw; # draw background, if applicable 1684 $self->SUPER::_draw; # draw background, if applicable
1676 1685
1677 my $tex = $self->{texture} ||= do { 1686 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1687 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1688 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1693
1685 new_from_layout CFClient::Texture $self->{layout} 1694 [$self->{layout}->size]
1686 }; 1695 };
1687 1696
1688 unless (exists $self->{ox}) { 1697 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1699 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $size->[0]) * 0.5);
1692 1701
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1705 };
1697 1706
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1707 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1708 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1709
1703 if ($tex->{format} == GL_ALPHA) { 1710 $self->{layout}->render ($self->{ox}, $self->{oy});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 1711}
1714 1712
1715############################################################################# 1713#############################################################################
1716 1714
1717package CFClient::UI::EntryBase; 1715package CFClient::UI::EntryBase;
… …
2059 my ($self) = @_; 2057 my ($self) = @_;
2060 2058
2061 (6) x 2 2059 (6) x 2
2062} 2060}
2063 2061
2062sub toggle {
2063 my ($self) = @_;
2064
2065 $self->{state} = !$self->{state};
2066 $self->emit (changed => $self->{state});
2067 $self->update;
2068}
2069
2064sub invoke_button_down { 2070sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_; 2071 my ($self, $ev, $x, $y) = @_;
2066 2072
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2073 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2074 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state}; 2075 $self->toggle;
2070 $self->emit (changed => $self->{state});
2071 } else { 2076 } else {
2072 return 0 2077 return 0
2073 } 2078 }
2074 2079
2075 1 2080 1
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2251 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2252 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2253
2249 my $h1 = $self->{h} * (1 - $ycut1); 2254 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2255 my $h2 = $self->{h} * (1 - $ycut2);
2256 my $h3 = $self->{h};
2257
2258 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2259
2252 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2261 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2262 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2263 glEnable GL_TEXTURE_2D;
… …
2274 2282
2275 if ($t3) { 2283 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2284 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2285 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2286 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2287 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2288 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2289 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2290 glEnd;
2283 } 2291 }
2284 2292
2285 glDisable GL_BLEND; 2293 glDisable GL_BLEND;
… …
2554 can_events => 0, 2562 can_events => 0,
2555 indent => 0, 2563 indent => 0,
2556 #font => default_font 2564 #font => default_font
2557 @_, 2565 @_,
2558 2566
2559 layout => (new CFClient::Layout 1), 2567 layout => (new CFClient::Layout),
2560 par => [], 2568 par => [],
2561 height => 0, 2569 height => 0,
2562 children => [ 2570 children => [
2563 (new CFClient::UI::Empty expand => 1), 2571 (new CFClient::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2572 (new CFClient::UI::Slider vertical => 1),
… …
2725 my $y0 = $top; 2733 my $y0 = $top;
2726 my $y1 = $top + $H; 2734 my $y1 = $top + $H;
2727 2735
2728 my $y = 0; 2736 my $y = 0;
2729 2737
2730 glEnable GL_BLEND;
2731 #TODO# not correct in windows where rgba is forced off
2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2733
2734 for my $para (@{$self->{par}}) { 2738 for my $para (@{$self->{par}}) {
2735 my $h = $para->{h}; 2739 my $h = $para->{h};
2736 2740
2737 if ($y0 < $y + $h && $y < $y1) { 2741 if ($y0 < $y + $h && $y < $y1) {
2738 2742
2739 my $layout = $self->get_layout ($para); 2743 my $layout = $self->get_layout ($para);
2740 2744
2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743 glRasterPos $para->{indent}, $y - $y0; 2745 $layout->render ($para->{indent}, $y - $y0);
2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745 2746
2746 if (my @w = @{ $para->{widget} }) { 2747 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes; 2748 my @s = $layout->get_shapes;
2748 2749
2749 glDisable GL_BLEND;
2750 for (@w) { 2750 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, (); 2751 my ($dx, $dy) = splice @s, 0, 2, ();
2752 2752
2753 $_->{x} = $dx + $para->{indent}; 2753 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0; 2754 $_->{y} = $dy + $y - $y0;
2755 2755
2756 $_->draw; 2756 $_->draw;
2757 } 2757 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 } 2758 }
2761 } 2759 }
2762 2760
2763 $y += $h; 2761 $y += $h;
2764 } 2762 }
2765
2766 glDisable GL_BLEND;
2767 }; 2763 };
2768 }); 2764 });
2769} 2765}
2770 2766
2771sub reconfigure { 2767sub reconfigure {
… …
3067 for my $item (@{ $self->{items} }) { 3063 for my $item (@{ $self->{items} }) {
3068 my ($widget, $cb, $tooltip) = @$item; 3064 my ($widget, $cb, $tooltip) = @$item;
3069 3065
3070 # handle various types of items, only text for now 3066 # handle various types of items, only text for now
3071 if (!ref $widget) { 3067 if (!ref $widget) {
3068 if ($widget =~ /\t/) {
3069 my ($left, $right) = split /\t/, $widget, 2;
3070
3071 $widget = new CFClient::UI::HBox
3072 can_hover => 1,
3073 can_events => 1,
3074 tooltip => $tooltip,
3075 children => [
3076 (new CFClient::UI::Label markup => $left, expand => 1),
3077 (new CFClient::UI::Label markup => $right, align => +1),
3078 ],
3079 ;
3080
3081 } else {
3072 $widget = new CFClient::UI::Label 3082 $widget = new CFClient::UI::Label
3073 can_hover => 1, 3083 can_hover => 1,
3074 can_events => 1, 3084 can_events => 1,
3075 markup => $widget, 3085 markup => $widget,
3076 tooltip => $tooltip 3086 tooltip => $tooltip;
3087 }
3077 } 3088 }
3078 3089
3079 $self->{item}{$widget} = $item; 3090 $self->{item}{$widget} = $item;
3080 3091
3081 $self->{vbox}->add ($widget); 3092 $self->{vbox}->add ($widget);
… …
3148 3159
3149 $self->SUPER::add (@widgets); 3160 $self->SUPER::add (@widgets);
3150 3161
3151 $self->{current} = $self->{children}[0] 3162 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} }; 3163 if @{ $self->{children} };
3164}
3165
3166sub get_current_page {
3167 my ($self) = @_;
3168
3169 $self->{current}
3153} 3170}
3154 3171
3155sub set_current_page { 3172sub set_current_page {
3156 my ($self, $page_or_widget) = @_; 3173 my ($self, $page_or_widget) = @_;
3157 3174
… …
3223 tooltip => $tooltip, 3240 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) }, 3241 on_activate => sub { $self->set_current_page ($widget) },
3225 ); 3242 );
3226 3243
3227 $self->{multiplexer}->add ($widget); 3244 $self->{multiplexer}->add ($widget);
3245}
3246
3247sub get_current_page {
3248 my ($self) = @_;
3249
3250 $self->{multiplexer}->get_current_page
3228} 3251}
3229 3252
3230sub set_current_page { 3253sub set_current_page {
3231 my ($self, $page) = @_; 3254 my ($self, $page) = @_;
3232 3255
… …
3437 3460
3438############################################################################# 3461#############################################################################
3439 3462
3440package CFClient::UI::Inventory; 3463package CFClient::UI::Inventory;
3441 3464
3442our @ISA = CFClient::UI::ScrolledWindow::; 3465our @ISA = CFClient::UI::Table::;
3443 3466
3444sub new { 3467sub new {
3445 my $class = shift; 3468 my $class = shift;
3446 3469
3447 my $self = $class->SUPER::new ( 3470 my $self = $class->SUPER::new (
3448 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3471 col_expand => [0, 1, 0],
3449 @_, 3472 @_,
3450 ); 3473 );
3451 3474
3452 $self 3475 $self
3453} 3476}
3454 3477
3455sub set_items { 3478sub set_items {
3456 my ($self, $items) = @_; 3479 my ($self, $items) = @_;
3457 3480
3458 $self->{child}->clear; 3481 $self->clear;
3459 return unless $items; 3482 return unless $items;
3460 3483
3461 my @items = sort { 3484 my @items = sort {
3462 ($a->{type} <=> $b->{type}) 3485 ($a->{type} <=> $b->{type})
3463 or ($a->{name} cmp $b->{name}) 3486 or ($a->{name} cmp $b->{name})
… …
3467 3490
3468 my $row = 0; 3491 my $row = 0;
3469 for my $item (@items) { 3492 for my $item (@items) {
3470 CFClient::Item::update_widgets $item; 3493 CFClient::Item::update_widgets $item;
3471 3494
3472 $self->{child}->add (0, $row, $item->{face_widget}); 3495 $self->add (0, $row, $item->{face_widget});
3473 $self->{child}->add (1, $row, $item->{desc_widget}); 3496 $self->add (1, $row, $item->{desc_widget});
3474 $self->{child}->add (2, $row, $item->{weight_widget}); 3497 $self->add (2, $row, $item->{weight_widget});
3475 3498
3476 $row++; 3499 $row++;
3477 } 3500 }
3478} 3501}
3479 3502

Diff Legend

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