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.314 by root, Mon Jun 26 21:59:04 2006 UTC vs.
Revision 1.322 by root, Wed Jul 5 01:53:24 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) = @_;
… …
1528 #font => default_font 1536 #font => default_font
1529 #text => initial text 1537 #text => initial text
1530 #markup => initial narkup 1538 #markup => initial narkup
1531 #max_w => maximum pixel width 1539 #max_w => maximum pixel width
1532 ellipsise => 3, # end 1540 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout 2),
1534 fontsize => 1, 1542 fontsize => 1,
1535 align => -1, 1543 align => -1,
1536 valign => -1, 1544 valign => -1,
1537 padding_x => 2, 1545 padding_x => 2,
1538 padding_y => 2, 1546 padding_y => 2,
1539 can_events => 0, 1547 can_events => 0,
1540 %arg 1548 %arg
1541 ); 1549 );
1542 1550
1543 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1552 my $layout = new CFClient::Layout 2;
1545 $layout->set_text (delete $self->{template}); 1553 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1554 $self->{template} = $layout;
1547 } 1555 }
1548 1556
1549 if (exists $self->{markup}) { 1557 if (exists $self->{markup}) {
… …
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;
… …
1654 1660
1655sub set_fontsize { 1661sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1662 my ($self, $fontsize) = @_;
1657 1663
1658 $self->{fontsize} = $fontsize; 1664 $self->{fontsize} = $fontsize;
1665 delete $self->{size_req};
1659 delete $self->{texture}; 1666 delete $self->{texture};
1660 1667
1661 $self->realloc; 1668 $self->realloc;
1662} 1669}
1663 1670
1664sub reconfigure { 1671sub reconfigure {
1665 my ($self) = @_; 1672 my ($self) = @_;
1666 1673
1667 delete $self->{size_req}; 1674 delete $self->{size_req};
1675 delete $self->{texture};
1668 1676
1669 $self->SUPER::reconfigure; 1677 $self->SUPER::reconfigure;
1670} 1678}
1671 1679
1672sub _draw { 1680sub _draw {
1673 my ($self) = @_; 1681 my ($self) = @_;
1674 1682
1675 $self->SUPER::_draw; # draw background, if applicable 1683 $self->SUPER::_draw; # draw background, if applicable
1676 1684
1677 my $tex = $self->{texture} ||= do { 1685 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1686 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1687 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1688 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1689 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1692
1685 new_from_layout CFClient::Texture $self->{layout} 1693 $self->{size_req}
1686 }; 1694 };
1687 1695
1688 unless (exists $self->{ox}) { 1696 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1699 : ($self->{w} - $size->[0]) * 0.5);
1692 1700
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1703 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1704 };
1697 1705
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1706 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1707 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1708
1703 if ($tex->{format} == GL_ALPHA) { 1709 $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} 1710}
1714 1711
1715############################################################################# 1712#############################################################################
1716 1713
1717package CFClient::UI::EntryBase; 1714package CFClient::UI::EntryBase;
… …
2059 my ($self) = @_; 2056 my ($self) = @_;
2060 2057
2061 (6) x 2 2058 (6) x 2
2062} 2059}
2063 2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
2064sub invoke_button_down { 2069sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_; 2070 my ($self, $ev, $x, $y) = @_;
2066 2071
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state}; 2074 $self->toggle;
2070 $self->emit (changed => $self->{state});
2071 } else { 2075 } else {
2072 return 0 2076 return 0
2073 } 2077 }
2074 2078
2075 1 2079 1
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2250 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2251 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2252
2249 my $h1 = $self->{h} * (1 - $ycut1); 2253 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2254 my $h2 = $self->{h} * (1 - $ycut2);
2255 my $h3 = $self->{h};
2256
2257 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2258
2252 glEnable GL_BLEND; 2259 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2260 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2261 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2274 2281
2275 if ($t3) { 2282 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2283 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2284 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2285 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2286 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2287 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2288 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2289 glEnd;
2283 } 2290 }
2284 2291
2285 glDisable GL_BLEND; 2292 glDisable GL_BLEND;
… …
2554 can_events => 0, 2561 can_events => 0,
2555 indent => 0, 2562 indent => 0,
2556 #font => default_font 2563 #font => default_font
2557 @_, 2564 @_,
2558 2565
2559 layout => (new CFClient::Layout 1), 2566 layout => (new CFClient::Layout 2),
2560 par => [], 2567 par => [],
2561 height => 0, 2568 height => 0,
2562 children => [ 2569 children => [
2563 (new CFClient::UI::Empty expand => 1), 2570 (new CFClient::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2571 (new CFClient::UI::Slider vertical => 1),
… …
2725 my $y0 = $top; 2732 my $y0 = $top;
2726 my $y1 = $top + $H; 2733 my $y1 = $top + $H;
2727 2734
2728 my $y = 0; 2735 my $y = 0;
2729 2736
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}}) { 2737 for my $para (@{$self->{par}}) {
2735 my $h = $para->{h}; 2738 my $h = $para->{h};
2736 2739
2737 if ($y0 < $y + $h && $y < $y1) { 2740 if ($y0 < $y + $h && $y < $y1) {
2738 2741
2739 my $layout = $self->get_layout ($para); 2742 my $layout = $self->get_layout ($para);
2740 2743
2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743 glRasterPos $para->{indent}, $y - $y0; 2744 $layout->render ($para->{indent}, $y - $y0);
2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745 2745
2746 if (my @w = @{ $para->{widget} }) { 2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes; 2747 my @s = $layout->get_shapes;
2748 2748
2749 glDisable GL_BLEND;
2750 for (@w) { 2749 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, (); 2750 my ($dx, $dy) = splice @s, 0, 2, ();
2752 2751
2753 $_->{x} = $dx + $para->{indent}; 2752 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0; 2753 $_->{y} = $dy + $y - $y0;
2755 2754
2756 $_->draw; 2755 $_->draw;
2757 } 2756 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 } 2757 }
2761 } 2758 }
2762 2759
2763 $y += $h; 2760 $y += $h;
2764 } 2761 }
2765
2766 glDisable GL_BLEND;
2767 }; 2762 };
2768 }); 2763 });
2769} 2764}
2770 2765
2771sub reconfigure { 2766sub reconfigure {
… …
3067 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
3068 my ($widget, $cb, $tooltip) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
3069 3064
3070 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
3071 if (!ref $widget) { 3066 if (!ref $widget) {
3067 if ($widget =~ /\t/) {
3068 my ($left, $right) = split /\t/, $widget, 2;
3069
3070 $widget = new CFClient::UI::HBox
3071 can_hover => 1,
3072 can_events => 1,
3073 tooltip => $tooltip,
3074 children => [
3075 (new CFClient::UI::Label markup => $left, expand => 1),
3076 (new CFClient::UI::Label markup => $right, align => +1),
3077 ],
3078 ;
3079
3080 } else {
3072 $widget = new CFClient::UI::Label 3081 $widget = new CFClient::UI::Label
3073 can_hover => 1, 3082 can_hover => 1,
3074 can_events => 1, 3083 can_events => 1,
3075 markup => $widget, 3084 markup => $widget,
3076 tooltip => $tooltip 3085 tooltip => $tooltip;
3086 }
3077 } 3087 }
3078 3088
3079 $self->{item}{$widget} = $item; 3089 $self->{item}{$widget} = $item;
3080 3090
3081 $self->{vbox}->add ($widget); 3091 $self->{vbox}->add ($widget);
… …
3148 3158
3149 $self->SUPER::add (@widgets); 3159 $self->SUPER::add (@widgets);
3150 3160
3151 $self->{current} = $self->{children}[0] 3161 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} }; 3162 if @{ $self->{children} };
3163}
3164
3165sub get_current_page {
3166 my ($self) = @_;
3167
3168 $self->{current}
3153} 3169}
3154 3170
3155sub set_current_page { 3171sub set_current_page {
3156 my ($self, $page_or_widget) = @_; 3172 my ($self, $page_or_widget) = @_;
3157 3173
… …
3223 tooltip => $tooltip, 3239 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) }, 3240 on_activate => sub { $self->set_current_page ($widget) },
3225 ); 3241 );
3226 3242
3227 $self->{multiplexer}->add ($widget); 3243 $self->{multiplexer}->add ($widget);
3244}
3245
3246sub get_current_page {
3247 my ($self) = @_;
3248
3249 $self->{multiplexer}->get_current_page
3228} 3250}
3229 3251
3230sub set_current_page { 3252sub set_current_page {
3231 my ($self, $page) = @_; 3253 my ($self, $page) = @_;
3232 3254
… …
3410 count => 1, 3432 count => 1,
3411 %arg, 3433 %arg,
3412 }; 3434 };
3413 } 3435 }
3414 3436
3437 $ROOT->on_refresh (reorder => sub {
3415 $self->reorder; 3438 $self->reorder;
3439 });
3416} 3440}
3417 3441
3418sub reconfigure { 3442sub reconfigure {
3419 my ($self) = @_; 3443 my ($self) = @_;
3420 3444
… …
3435 3459
3436############################################################################# 3460#############################################################################
3437 3461
3438package CFClient::UI::Inventory; 3462package CFClient::UI::Inventory;
3439 3463
3440our @ISA = CFClient::UI::ScrolledWindow::; 3464our @ISA = CFClient::UI::Table::;
3441 3465
3442sub new { 3466sub new {
3443 my $class = shift; 3467 my $class = shift;
3444 3468
3445 my $self = $class->SUPER::new ( 3469 my $self = $class->SUPER::new (
3446 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3470 col_expand => [0, 1, 0],
3447 @_, 3471 @_,
3448 ); 3472 );
3449 3473
3450 $self 3474 $self
3451} 3475}
3452 3476
3453sub set_items { 3477sub set_items {
3454 my ($self, $items) = @_; 3478 my ($self, $items) = @_;
3455 3479
3456 $self->{child}->clear; 3480 $self->clear;
3457 return unless $items; 3481 return unless $items;
3458 3482
3459 my @items = sort { 3483 my @items = sort {
3460 ($a->{type} <=> $b->{type}) 3484 ($a->{type} <=> $b->{type})
3461 or ($a->{name} cmp $b->{name}) 3485 or ($a->{name} cmp $b->{name})
3462 } @$items; 3486 } values %$items;
3463 3487
3464 $self->{real_items} = \@items; 3488 $self->{real_items} = \@items;
3465 3489
3466 my $row = 0; 3490 my $row = 0;
3467 for my $item (@items) { 3491 for my $item (@items) {
3468 CFClient::Item::update_widgets $item; 3492 CFClient::Item::update_widgets $item;
3469 3493
3470 $self->{child}->add (0, $row, $item->{face_widget}); 3494 $self->add (0, $row, $item->{face_widget});
3471 $self->{child}->add (1, $row, $item->{desc_widget}); 3495 $self->add (1, $row, $item->{desc_widget});
3472 $self->{child}->add (2, $row, $item->{weight_widget}); 3496 $self->add (2, $row, $item->{weight_widget});
3473 3497
3474 $row++; 3498 $row++;
3475 } 3499 }
3476} 3500}
3477 3501

Diff Legend

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