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.316 by root, Sun Jul 2 13:57:58 2006 UTC vs.
Revision 1.321 by root, Tue Jul 4 23:44:23 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;
… …
1664 1670
1665sub reconfigure { 1671sub reconfigure {
1666 my ($self) = @_; 1672 my ($self) = @_;
1667 1673
1668 delete $self->{size_req}; 1674 delete $self->{size_req};
1675 delete $self->{texture};
1669 1676
1670 $self->SUPER::reconfigure; 1677 $self->SUPER::reconfigure;
1671} 1678}
1672 1679
1673sub _draw { 1680sub _draw {
1674 my ($self) = @_; 1681 my ($self) = @_;
1675 1682
1676 $self->SUPER::_draw; # draw background, if applicable 1683 $self->SUPER::_draw; # draw background, if applicable
1677 1684
1678 my $tex = $self->{texture} ||= do { 1685 my $size = $self->{texture} ||= do {
1679 $self->{layout}->set_foreground (@{$self->{fg}}); 1686 $self->{layout}->set_foreground (@{$self->{fg}});
1680 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1687 $self->{layout}->set_font ($self->{font}) if $self->{font};
1681 $self->{layout}->set_width ($self->{w}); 1688 $self->{layout}->set_width ($self->{w});
1682 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1689 $self->{layout}->set_ellipsise ($self->{ellipsise});
1683 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685 1692
1686 new_from_layout CFClient::Texture $self->{layout} 1693 $self->{size_req}
1687 }; 1694 };
1688 1695
1689 unless (exists $self->{ox}) { 1696 unless (exists $self->{ox}) {
1690 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692 : ($self->{w} - $tex->{w}) * 0.5); 1699 : ($self->{w} - $size->[0]) * 0.5);
1693 1700
1694 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696 : ($self->{h} - $tex->{h}) * 0.5); 1703 : ($self->{h} - $size->[1]) * 0.5);
1697 }; 1704 };
1698 1705
1699 glEnable GL_TEXTURE_2D;
1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1706 my $w = List::Util::min $self->{w} + 4, $size->[0];
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1707 my $h = List::Util::min $self->{h} + 2, $size->[1];
1703 1708
1704 if ($tex->{format} == GL_ALPHA) { 1709 $self->{layout}->render ($self->{ox}, $self->{oy});
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706 glColor @{$self->{fg}};
1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711 }
1712
1713 glDisable GL_TEXTURE_2D;
1714} 1710}
1715 1711
1716############################################################################# 1712#############################################################################
1717 1713
1718package CFClient::UI::EntryBase; 1714package CFClient::UI::EntryBase;
… …
2060 my ($self) = @_; 2056 my ($self) = @_;
2061 2057
2062 (6) x 2 2058 (6) x 2
2063} 2059}
2064 2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
2065sub invoke_button_down { 2069sub invoke_button_down {
2066 my ($self, $ev, $x, $y) = @_; 2070 my ($self, $ev, $x, $y) = @_;
2067 2071
2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070 $self->{state} = !$self->{state}; 2074 $self->toggle;
2071 $self->emit (changed => $self->{state});
2072 } else { 2075 } else {
2073 return 0 2076 return 0
2074 } 2077 }
2075 2078
2076 1 2079 1
… …
2247 my $ycut1 = max 0, min 1, $ycut; 2250 my $ycut1 = max 0, min 1, $ycut;
2248 my $ycut2 = max 0, min 1, $ycut - 1; 2251 my $ycut2 = max 0, min 1, $ycut - 1;
2249 2252
2250 my $h1 = $self->{h} * (1 - $ycut1); 2253 my $h1 = $self->{h} * (1 - $ycut1);
2251 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);
2252 2258
2253 glEnable GL_BLEND; 2259 glEnable GL_BLEND;
2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2260 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2261 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2275 2281
2276 if ($t3) { 2282 if ($t3) {
2277 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2283 glBindTexture GL_TEXTURE_2D, $t3->{name};
2278 glBegin GL_QUADS; 2284 glBegin GL_QUADS;
2279 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2285 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2286 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2287 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2288 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283 glEnd; 2289 glEnd;
2284 } 2290 }
2285 2291
2286 glDisable GL_BLEND; 2292 glDisable GL_BLEND;
… …
2555 can_events => 0, 2561 can_events => 0,
2556 indent => 0, 2562 indent => 0,
2557 #font => default_font 2563 #font => default_font
2558 @_, 2564 @_,
2559 2565
2560 layout => (new CFClient::Layout 1), 2566 layout => (new CFClient::Layout 2),
2561 par => [], 2567 par => [],
2562 height => 0, 2568 height => 0,
2563 children => [ 2569 children => [
2564 (new CFClient::UI::Empty expand => 1), 2570 (new CFClient::UI::Empty expand => 1),
2565 (new CFClient::UI::Slider vertical => 1), 2571 (new CFClient::UI::Slider vertical => 1),
… …
2726 my $y0 = $top; 2732 my $y0 = $top;
2727 my $y1 = $top + $H; 2733 my $y1 = $top + $H;
2728 2734
2729 my $y = 0; 2735 my $y = 0;
2730 2736
2731 glEnable GL_BLEND;
2732 #TODO# not correct in windows where rgba is forced off
2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735 for my $para (@{$self->{par}}) { 2737 for my $para (@{$self->{par}}) {
2736 my $h = $para->{h}; 2738 my $h = $para->{h};
2737 2739
2738 if ($y0 < $y + $h && $y < $y1) { 2740 if ($y0 < $y + $h && $y < $y1) {
2739 2741
2740 my $layout = $self->get_layout ($para); 2742 my $layout = $self->get_layout ($para);
2741 2743
2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744 glRasterPos $para->{indent}, $y - $y0; 2744 $layout->render ($para->{indent}, $y - $y0);
2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746 2745
2747 if (my @w = @{ $para->{widget} }) { 2746 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes; 2747 my @s = $layout->get_shapes;
2749 2748
2750 glDisable GL_BLEND;
2751 for (@w) { 2749 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, (); 2750 my ($dx, $dy) = splice @s, 0, 2, ();
2753 2751
2754 $_->{x} = $dx + $para->{indent}; 2752 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0; 2753 $_->{y} = $dy + $y - $y0;
2756 2754
2757 $_->draw; 2755 $_->draw;
2758 } 2756 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 } 2757 }
2762 } 2758 }
2763 2759
2764 $y += $h; 2760 $y += $h;
2765 } 2761 }
2766
2767 glDisable GL_BLEND;
2768 }; 2762 };
2769 }); 2763 });
2770} 2764}
2771 2765
2772sub reconfigure { 2766sub reconfigure {
… …
3151 3145
3152 $self->{current} = $self->{children}[0] 3146 $self->{current} = $self->{children}[0]
3153 if @{ $self->{children} }; 3147 if @{ $self->{children} };
3154} 3148}
3155 3149
3150sub get_current_page {
3151 my ($self) = @_;
3152
3153 $self->{current}
3154}
3155
3156sub set_current_page { 3156sub set_current_page {
3157 my ($self, $page_or_widget) = @_; 3157 my ($self, $page_or_widget) = @_;
3158 3158
3159 my $widget = ref $page_or_widget 3159 my $widget = ref $page_or_widget
3160 ? $page_or_widget 3160 ? $page_or_widget
… …
3224 tooltip => $tooltip, 3224 tooltip => $tooltip,
3225 on_activate => sub { $self->set_current_page ($widget) }, 3225 on_activate => sub { $self->set_current_page ($widget) },
3226 ); 3226 );
3227 3227
3228 $self->{multiplexer}->add ($widget); 3228 $self->{multiplexer}->add ($widget);
3229}
3230
3231sub get_current_page {
3232 my ($self) = @_;
3233
3234 $self->{multiplexer}->get_current_page
3229} 3235}
3230 3236
3231sub set_current_page { 3237sub set_current_page {
3232 my ($self, $page) = @_; 3238 my ($self, $page) = @_;
3233 3239
… …
3438 3444
3439############################################################################# 3445#############################################################################
3440 3446
3441package CFClient::UI::Inventory; 3447package CFClient::UI::Inventory;
3442 3448
3443our @ISA = CFClient::UI::ScrolledWindow::; 3449our @ISA = CFClient::UI::Table::;
3444 3450
3445sub new { 3451sub new {
3446 my $class = shift; 3452 my $class = shift;
3447 3453
3448 my $self = $class->SUPER::new ( 3454 my $self = $class->SUPER::new (
3449 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3455 col_expand => [0, 1, 0],
3450 @_, 3456 @_,
3451 ); 3457 );
3452 3458
3453 $self 3459 $self
3454} 3460}
3455 3461
3456sub set_items { 3462sub set_items {
3457 my ($self, $items) = @_; 3463 my ($self, $items) = @_;
3458 3464
3459 $self->{child}->clear; 3465 $self->clear;
3460 return unless $items; 3466 return unless $items;
3461 3467
3462 my @items = sort { 3468 my @items = sort {
3463 ($a->{type} <=> $b->{type}) 3469 ($a->{type} <=> $b->{type})
3464 or ($a->{name} cmp $b->{name}) 3470 or ($a->{name} cmp $b->{name})
… …
3468 3474
3469 my $row = 0; 3475 my $row = 0;
3470 for my $item (@items) { 3476 for my $item (@items) {
3471 CFClient::Item::update_widgets $item; 3477 CFClient::Item::update_widgets $item;
3472 3478
3473 $self->{child}->add (0, $row, $item->{face_widget}); 3479 $self->add (0, $row, $item->{face_widget});
3474 $self->{child}->add (1, $row, $item->{desc_widget}); 3480 $self->add (1, $row, $item->{desc_widget});
3475 $self->{child}->add (2, $row, $item->{weight_widget}); 3481 $self->add (2, $row, $item->{weight_widget});
3476 3482
3477 $row++; 3483 $row++;
3478 } 3484 }
3479} 3485}
3480 3486

Diff Legend

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