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.283 by root, Mon Jun 5 02:28:30 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->focus_out;
286 287
287 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
314} 315}
315 316
316sub move_abs { 317sub move_abs {
317 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
318 319
319 $self->{x} = List::Util::max 0, int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
322 323
323 $self->update; 324 $self->update;
324} 325}
325 326
… …
399 400
400 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
401 402
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
404 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
405 } 406 }
406} 407}
407 408
408# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
409sub coord2local { 410sub coord2local {
… …
592 593
593sub DESTROY { 594sub DESTROY {
594 my ($self) = @_; 595 my ($self) = @_;
595 596
596 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
597 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 601}
599 602
600############################################################################# 603#############################################################################
601 604
602package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
767} 770}
768 771
769sub add { 772sub add {
770 my ($self, $child) = @_; 773 my ($self, $child) = @_;
771 774
772 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
775} 777}
776 778
777sub remove { 779sub remove {
778 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1074
1073sub new { 1075sub new {
1074 my ($class, %arg) = @_; 1076 my ($class, %arg) = @_;
1075
1076 my $title = delete $arg{title};
1077 1077
1078 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1081 border => 0.6,
… …
1083 min_w => 16, 1083 min_w => 16,
1084 min_h => 16, 1084 min_h => 16,
1085 %arg, 1085 %arg,
1086 ); 1086 );
1087 1087
1088 $self->{title} = new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1089 align => 0,
1090 valign => 1, 1090 valign => 1,
1091 text => $title, 1091 text => $self->{title},
1092 fontsize => $self->{border} 1092 fontsize => $self->{border},
1093 if defined $title; 1093 if exists $self->{title};
1094 1094
1095 $self 1095 $self
1096} 1096}
1097 1097
1098sub add { 1098sub add {
1099 my ($self, @widgets) = @_; 1099 my ($self, @widgets) = @_;
1100 1100
1101 $self->SUPER::add (@widgets); 1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1103}
1104 1104
1105sub border { 1105sub border {
1106 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1107} 1107}
1108 1108
1109sub size_request { 1109sub size_request {
1110 my ($self) = @_; 1110 my ($self) = @_;
1111 1111
1112 $self->{title}->size_request 1112 $self->{title_widget}->size_request
1113 if $self->{title}; 1113 if $self->{title_widget};
1114 1114
1115 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1116 1116
1117 ( 1117 (
1118 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1121} 1121}
1122 1122
1123sub size_allocate { 1123sub size_allocate {
1124 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1125 1125
1126 if ($self->{title}) { 1126 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1127 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1128 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1129 $self->{title_widget}->size_allocate ($w, $h);
1130 } 1130 }
1131 1131
1132 my $border = $self->border; 1132 my $border = $self->border;
1133 1133
1134 $h -= List::Util::max 0, $border * 2; 1134 $h -= List::Util::max 0, $border * 2;
… …
1232 1232
1233 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1234 1234
1235 $child->draw; 1235 $child->draw;
1236 1236
1237 if ($self->{title}) { 1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1239 $self->{title_widget}->_draw;
1240 } 1240 }
1241} 1241}
1242 1242
1243############################################################################# 1243#############################################################################
1244 1244
… …
1268 1268
1269 $child->set_parent ($self); 1269 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1271 1271
1272 $self->realloc; 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1273} 1279}
1274 1280
1275# TODO: move to container class maybe? send children a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1282sub clear {
1277 my ($self) = @_; 1283 my ($self) = @_;
… …
1553 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1554 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1555 1561
1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1564
1558 delete $self->{req_h}; 1565 delete $self->{size_req};
1559
1560 $self->realloc; 1566 $self->realloc;
1561 $self->update; 1567 $self->update;
1562} 1568}
1563 1569
1564sub set_markup { 1570sub set_markup {
… …
1569 1575
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1577
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1580
1574 delete $self->{req_h}; 1581 delete $self->{size_req};
1575
1576 $self->realloc; 1582 $self->realloc;
1577 $self->update; 1583 $self->update;
1578} 1584}
1579 1585
1580sub size_request { 1586sub size_request {
1581 my ($self) = @_; 1587 my ($self) = @_;
1582 1588
1583 if (exists $self->{req_h}) { 1589 $self->{size_req} ||= do {
1584 @$self{qw(req_w req_h)}
1585 } else {
1586 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1587 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
… …
1599 1603
1600 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1601 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1602 } 1606 }
1603 1607
1604 ($w, $h) 1608 [$w, $h]
1605 } 1609 };
1610
1611 @{ $self->{size_req} }
1606} 1612}
1607 1613
1608sub size_allocate { 1614sub size_allocate {
1609 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1610 1616
… …
1619 1625
1620 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1621 delete $self->{texture}; 1627 delete $self->{texture};
1622 1628
1623 $self->realloc; 1629 $self->realloc;
1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1624} 1638}
1625 1639
1626sub _draw { 1640sub _draw {
1627 my ($self) = @_; 1641 my ($self) = @_;
1628 1642
… …
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1650 }; 1664 };
1651 1665
1652 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1670
1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673 glColor @{$self->{fg}};
1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675 } else {
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654
1655 glColor_premultiply @{$self->{fg}}
1656 if $tex->{format} == GL_ALPHA;
1657
1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678 }
1659 1679
1660 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1661} 1681}
1662 1682
1663############################################################################# 1683#############################################################################
… …
1679 can_hover => 1, 1699 can_hover => 1,
1680 can_focus => 1, 1700 can_focus => 1,
1681 valign => 0, 1701 valign => 0,
1682 can_events => 1, 1702 can_events => 1,
1683 #text => ... 1703 #text => ...
1704 #hidden => "*",
1684 @_ 1705 @_
1685 ) 1706 )
1686} 1707}
1687 1708
1688sub _set_text { 1709sub _set_text {
… …
1695 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1696 $self->{text} = $text; 1717 $self->{text} = $text;
1697 1718
1698 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1699 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h}; 1721 delete $self->{size_req};
1701 1722
1702 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1703 1724
1704 $self->realloc; 1725 $self->realloc;
1705 $self->update; 1726 $self->update;
… …
2291sub set_range { 2312sub set_range {
2292 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2293 2314
2294 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2295 2316
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2298} 2321}
2299 2322
2300sub set_value { 2323sub set_value {
2301 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2302 2325
… …
2449sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2451 2474
2452############################################################################# 2475#############################################################################
2453 2476
2454package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2455 2478
2456our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2457 2480
2458use CFClient::OpenGL; 2481use CFClient::OpenGL;
2459 2482
… …
2461 my $class = shift; 2484 my $class = shift;
2462 2485
2463 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2464 fontsize => 1, 2487 fontsize => 1,
2465 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2466 #font => default_font 2490 #font => default_font
2467 @_, 2491 @_,
2468 2492
2469 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2470 par => [], 2494 par => [],
… …
2493 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2494 2518
2495 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498 2523
2499 $self->reflow; 2524 $self->reflow;
2500} 2525}
2501 2526
2502sub text_size { 2527sub text_size {
… …
2504 2529
2505 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2506 2531
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $layout->set_width ($self->{children}[0]{w} - $indent); 2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2510 2536
2511 $layout->size 2537 $layout->size
2512} 2538}
2513 2539
… …
2552 2578
2553 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2554 2580
2555 delete $self->{texture}; 2581 delete $self->{texture};
2556 2582
2557 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559 2585
2560 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2561 my $height = 0; 2587 my $height = 0;
2562 2588
… …
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566 2592
2567 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2569 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2570 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2573 $_->[1] = $h; 2600 $_->[1] = $h;
2574 } 2601 }
… …
2577 } 2604 }
2578 2605
2579 $self->{height} = $height; 2606 $self->{height} = $height;
2580 2607
2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2582 2609
2583 delete $self->{texture}; 2610 delete $self->{texture};
2584 } 2611 }
2585 2612
2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2587 glClearColor 0, 0, 0, 0; 2614 glClearColor 0, 0, 0, 0;
… …
2606 my $h = $par->[1]; 2633 my $h = $par->[1];
2607 2634
2608 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2610 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2611 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2612 2640
2613 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2614 2642
2615 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2729 $tooltip .= "\n\n" . (ref $widget) . "\n" 2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n" 2759 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}"; 2760 . "visible $widget->{visible}";
2733 } 2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2734 2765
2735 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2736 markup => $tooltip, 2767 markup => $tooltip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8, 2769 fontsize => 0.8,
… …
2766 or return; 2797 or return;
2767 2798
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769 2800
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH; 2802 if $x + $self->{w} > $self->{root}{w};
2772 2803
2773 $self->move_abs ($x, $y); 2804 $self->move_abs ($x, $y);
2774 }); 2805 });
2775} 2806}
2776 2807
… …
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2873 } 2904 }
2874} 2905}
2875 2906
2876sub DESTROY { 2907sub destroy {
2877 my ($self) = @_; 2908 my ($self) = @_;
2878 2909
2879 $self->{timer}->cancel 2910 $self->{timer}->cancel
2880 if $self->{timer}; 2911 if $self->{timer};
2881 2912
2882 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2883} 2914}
2884 2915
2885############################################################################# 2916#############################################################################
2886 2917
2887package CFClient::UI::Buttonbar; 2918package CFClient::UI::Buttonbar;
… …
2908 ); 2939 );
2909 2940
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2911 2942
2912 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2914 2945
2915 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2916 if (!ref $widget) { 2947 if (!ref $widget) {
2917 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2918 can_hover => 1, 2949 can_hover => 1,
2919 can_events => 1, 2950 can_events => 1,
2920 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2921 } 2953 }
2922 2954
2923 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2924 2956
2925 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
3072sub set_current_page { 3104sub set_current_page {
3073 my ($self, $page) = @_; 3105 my ($self, $page) = @_;
3074 3106
3075 $self->{multiplexer}->set_current_page ($page); 3107 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current}); 3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3109}
3110
3111#############################################################################
3112
3113package CFClient::UI::Combobox;
3114
3115use utf8;
3116
3117our @ISA = CFClient::UI::Button::;
3118
3119sub new {
3120 my $class = shift;
3121
3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3077} 3165}
3078 3166
3079############################################################################# 3167#############################################################################
3080 3168
3081package CFClient::UI::Statusbox; 3169package CFClient::UI::Statusbox;
… …
3180 $item->{count}++; 3268 $item->{count}++;
3181 } else { 3269 } else {
3182 $item->{count} = 1; 3270 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
3184 } 3272 }
3185 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
3186 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
3187 delete $item->{label}; 3275 delete $item->{label};
3188 } else { 3276 } else {
3189 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
3190 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
3209 3297
3210 $self->reorder; 3298 $self->reorder;
3211 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
3212} 3300}
3213 3301
3214sub DESTROY { 3302sub destroy {
3215 my ($self) = @_; 3303 my ($self) = @_;
3216 3304
3217 $self->{timer}->cancel; 3305 $self->{timer}->cancel;
3218 3306
3219 $self->SUPER::DESTROY; 3307 $self->SUPER::destroy;
3220} 3308}
3221 3309
3222############################################################################# 3310#############################################################################
3223 3311
3224package CFClient::UI::Inventory; 3312package CFClient::UI::Inventory;
… …
3472 commands => [], 3560 commands => [],
3473 @_, 3561 @_,
3474 ) 3562 )
3475} 3563}
3476 3564
3477# XXX: Do sorting? Argl... 3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3478sub add_spell { 3650sub add_spell {
3479 my ($self, $spell) = @_; 3651 my ($self, $spell) = @_;
3652
3480 $self->{spells}->{$spell->{name}} = $spell; 3653 $self->{spell}->{$spell->{name}} = $spell;
3481 3654 $self->rebuild_spell_list;
3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509} 3655}
3510 3656
3511sub remove_spell { 3657sub remove_spell {
3512 my ($self, $spell) = @_; 3658 my ($self, $spell) = @_;
3659
3513 delete $self->{spells}->{$spell->{name}}; 3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3514 $self->rebuild_spell_list; 3668 $self->rebuild_spell_list;
3515} 3669}
3516 3670
3517############################################################################# 3671#############################################################################
3518 3672

Diff Legend

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