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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.233 by root, Thu May 25 03:42:40 2006 UTC

… …
11our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
12 12
13our $ROOT; 13our $ROOT;
14our $TOOLTIP; 14our $TOOLTIP;
15our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
16 18
17sub check_tooltip { 19sub check_tooltip {
18 if (!$GRAB) { 20 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
24 26
25 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
26 28
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 30
29 $TOOLTIP->set_markup ($widget->{tooltip}, $widget->{tooltip_font}); 31 $TOOLTIP->set_tooltip_from ($widget);
30
31 $TOOLTIP->show; 32 $TOOLTIP->show;
32 33
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34 35
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
38 38
39 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
40 } 42 }
41 43
42 return; 44 return;
43 } 45 }
44 } 46 }
… …
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49} 51}
50 52
51# class methods for events 53# class methods for events
52sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
53 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
54 if $FOCUS; 56 if $FOCUS;
55} 57}
56 58
57sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
58 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
59 if $FOCUS; 61 if $FOCUS;
60} 62}
61 63
62sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
63 my ($ev) = @_; 65 my ($ev) = @_;
… …
72 check_tooltip; 74 check_tooltip;
73 } 75 }
74 76
75 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
76 78
77 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
78 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
79 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80 }
81} 81}
82 82
83sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
84 my ($ev) = @_; 84 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
86 86
87 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
88 88
89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
90 90
91 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
92 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
93 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94 }
95 93
96 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
97 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
98 $grab->update if $grab; 96 $grab->update if $grab;
99 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
115 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
116 114
117 check_tooltip; 115 check_tooltip;
118 } 116 }
119 117
120 if ($HOVER) {
121 ($x, $y) = $HOVER->coord2local ($x, $y);
122 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
123 } 119 if $HOVER;
124} 120}
125 121
126# convert position array to integers 122# convert position array to integers
127sub harmonize { 123sub harmonize {
128 my ($vals) = @_; 124 my ($vals) = @_;
… …
132 for (@$vals) { 128 for (@$vals) {
133 my $i = int $_ + $rem; 129 my $i = int $_ + $rem;
134 $rem += $_ - $i; 130 $rem += $_ - $i;
135 $_ = $i; 131 $_ = $i;
136 } 132 }
133}
134
135sub full_refresh {
136 # make a copy, otherwise for complains about freed values.
137 my @widgets = values %WIDGET;
138
139 $_->update
140 for @widgets;
141}
142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
151# call when resolution changes etc.
152sub rescale_widgets {
153 my ($sx, $sy) = @_;
154
155 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) {
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
165 }
166 }
167
168 reconfigure_widgets;
137} 169}
138 170
139############################################################################# 171#############################################################################
140 172
141package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
159 if (/^connect_(.*)$/) { 191 if (/^connect_(.*)$/) {
160 $self->connect ($1 => delete $self->{$_}); 192 $self->connect ($1 => delete $self->{$_});
161 } 193 }
162 } 194 }
163 195
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197
164 $self 198 $self
165} 199}
166 200
167sub destroy { 201sub destroy {
168 my ($self) = @_; 202 my ($self) = @_;
… …
171 %$self = (); 205 %$self = ();
172} 206}
173 207
174sub show { 208sub show {
175 my ($self) = @_; 209 my ($self) = @_;
176
177 return if $self->{parent}; 210 return if $self->{parent};
178 211
179 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
180} 213}
181 214
182sub hide { 215sub show_centered {
183 my ($self) = @_; 216 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220
221 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
224 },
225 );
226}
227
228sub set_invisible {
229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
184 234
185 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237
238 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
241 $self->focus_out;
242}
243
244sub hide {
245 my ($self) = @_;
246
247 $self->set_invisible;
187 248
188 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
189 if $self->{parent}; 250 if $self->{parent};
190} 251}
191 252
… …
241 302
242sub size_allocate { 303sub size_allocate {
243 # nothing to be done 304 # nothing to be done
244} 305}
245 306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
246sub children { 314sub children {
247}
248
249# call when resolution changes etc.
250sub reconfigure {
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259} 315}
260 316
261sub set_max_size { 317sub set_max_size {
262 my ($self, $w, $h) = @_; 318 my ($self, $w, $h) = @_;
263 319
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
322}
323
324sub set_tooltip {
325 my ($self, $tooltip) = @_;
326
327 $self->{tooltip} = $tooltip;
328
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner};
331 CFClient::UI::check_tooltip;
332 }
266} 333}
267 334
268# translate global coordinates to local coordinate system 335# translate global coordinates to local coordinate system
269sub coord2local { 336sub coord2local {
270 my ($self, $x, $y) = @_; 337 my ($self, $x, $y) = @_;
… …
285 return if $FOCUS == $self; 352 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 353 return unless $self->{can_focus};
287 354
288 my $focus = $FOCUS; $FOCUS = $self; 355 my $focus = $FOCUS; $FOCUS = $self;
289 356
290 $self->emit (focus_in => $focus); 357 $self->_emit (focus_in => $focus);
291 358
292 $focus->update if $focus; 359 $focus->update if $focus;
293 $FOCUS->update; 360 $FOCUS->update;
294} 361}
295 362
… …
298 365
299 return unless $FOCUS == $self; 366 return unless $FOCUS == $self;
300 367
301 my $focus = $FOCUS; undef $FOCUS; 368 my $focus = $FOCUS; undef $FOCUS;
302 369
303 $self->emit (focus_out => $focus); 370 $self->_emit (focus_out => $focus);
304 371
305 $focus->update if $focus; #? 372 $focus->update if $focus; #?
373
374 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
375 unless $FOCUS;
306} 376}
307 377
308sub mouse_motion { } 378sub mouse_motion { }
309sub button_up { } 379sub button_up { }
310sub key_down { } 380sub key_down { }
311sub key_up { } 381sub key_up { }
312 382
313sub button_down { 383sub button_down {
314 my ($self, $ev, $x, $y) = @_; 384 my ($self, $ev, $x, $y) = @_;
315 385
316 $self->focus_in; 386 $self->focus_in;
… …
356 glVertex $self->{w}, 0; 426 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 427 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 428 glVertex 0 , $self->{h};
359 glEnd; 429 glEnd;
360 glPopMatrix; 430 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 432 }
363} 433}
364 434
365sub _draw { 435sub _draw {
366 my ($self) = @_; 436 my ($self) = @_;
… …
383sub set_parent { 453sub set_parent {
384 my ($self, $parent) = @_; 454 my ($self, $parent) = @_;
385 455
386 Scalar::Util::weaken ($self->{parent} = $parent); 456 Scalar::Util::weaken ($self->{parent} = $parent);
387 457
458 # TODO: req_w _does_change after ->reconfigure
388 $self->check_size 459 $self->check_size
389 unless exists $self->{req_w}; 460 unless exists $self->{req_w};
461
462 $self->show;
390} 463}
391 464
392sub check_size { 465sub check_size {
393 my ($self) = @_; 466 my ($self, $forced) = @_;
394 467
468 $self->{force_alloc} = 1 if $forced;
395 $CFClient::UI::ROOT->{check_size}{$self} = $self; 469 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396} 470}
397 471
398sub update { 472sub update {
399 my ($self) = @_; 473 my ($self) = @_;
… …
406 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
407 481
408 push @{ $self->{signal_cb}{$signal} }, $cb; 482 push @{ $self->{signal_cb}{$signal} }, $cb;
409} 483}
410 484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
411sub emit { 491sub emit {
412 my ($self, $signal, @args) = @_; 492 my ($self, $signal, @args) = @_;
413 493
414 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
415} 496}
416 497
417sub DESTROY { 498sub DESTROY {
418 my ($self) = @_; 499 my ($self) = @_;
419 500
501 delete $WIDGET{$self+0};
420 #$self->deactivate; 502 #$self->deactivate;
421} 503}
422 504
423############################################################################# 505#############################################################################
424 506
… …
433 my $class = shift; 515 my $class = shift;
434 516
435 # range [value, low, high, page] 517 # range [value, low, high, page]
436 518
437 $class->SUPER::new ( 519 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 520 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 521 #active_bg => [1, 1, 1, 0.5],
440 @_ 522 @_
441 ) 523 )
442} 524}
443 525
444sub _draw { 526sub _draw {
445 my ($self) = @_; 527 my ($self) = @_;
446 528
529 my $color = $FOCUS == $self && $self->{active_bg}
530 ? $self->{active_bg}
531 : $self->{bg};
532
533 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 534 my ($w, $h) = @$self{qw(w h)};
448 535
449 glEnable GL_BLEND; 536 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 538 glColor @$color;
452 539
453 glBegin GL_QUADS; 540 glBegin GL_QUADS;
454 glVertex 0 , 0; 541 glVertex 0 , 0;
455 glVertex 0 , $h; 542 glVertex 0 , $h;
456 glVertex $w, $h; 543 glVertex $w, $h;
457 glVertex $w, 0; 544 glVertex $w, 0;
458 glEnd; 545 glEnd;
459 546
460 glDisable GL_BLEND; 547 glDisable GL_BLEND;
548 }
461} 549}
462 550
463############################################################################# 551#############################################################################
464 552
465package CFClient::UI::Empty; 553package CFClient::UI::Empty;
… …
509 $self->{children} = [ 597 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 598 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 599 @{$self->{children}}, @widgets
512 ]; 600 ];
513 601
514 $self->check_size; 602 $self->check_size (1);
515 $self->update; 603 $self->update;
516} 604}
517 605
518sub children { 606sub children {
519 @{ $_[0]{children} } 607 @{ $_[0]{children} }
… …
626} 714}
627 715
628sub update { 716sub update {
629 my ($self) = @_; 717 my ($self) = @_;
630 718
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 719 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 720 $self->SUPER::update;
633} 721}
634 722
635sub size_allocate { 723sub size_allocate {
636 my ($self, $w, $h) = @_; 724 my ($self, $w, $h) = @_;
… …
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 737 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0; 738 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT; 739 glClear GL_COLOR_BUFFER_BIT;
652 740
653 $self->_render; 741 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 }; 742 };
662} 743}
663 744
664sub _draw { 745sub _draw {
665 my ($self) = @_; 746 my ($self) = @_;
… …
669 my $tex = $self->{texture} 750 my $tex = $self->{texture}
670 or return; 751 or return;
671 752
672 glEnable GL_TEXTURE_2D; 753 glEnable GL_TEXTURE_2D;
673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1; 755 glColor 1, 1, 1, 1;
675 756
676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 757 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
677 758
678 glDisable GL_TEXTURE_2D; 759 glDisable GL_TEXTURE_2D;
679} 760}
… …
686 767
687sub size_request { 768sub size_request {
688 my ($self) = @_; 769 my ($self) = @_;
689 770
690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
692 772
693 @$self{qw(child_w child_h)} 773 @$self{qw(child_w child_h)}
694} 774}
695 775
696sub size_allocate { 776sub size_allocate {
697 my ($self, $w, $h) = @_; 777 my ($self, $w, $h) = @_;
698 778
779 my ($cw, $ch) = @$self{qw(child_w child_h)};
780# $w = $self->{w};
781 $self->child->configure (0, 0, $cw, $ch);
699 $self->update; 782 $self->update;
700} 783}
701 784
702sub set_offset { 785sub set_offset {
703 my ($self, $x, $y) = @_; 786 my ($self, $x, $y) = @_;
… …
757 840
758 my $slider = new CFClient::UI::Slider 841 my $slider = new CFClient::UI::Slider
759 vertical => 1, 842 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix 843 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub { 844 connect_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 845 $self->{vp}->set_offset (0, $_[1]);
763 }, 846 },
764 ; 847 ;
765 848
766 $self = $class->SUPER::new ( 849 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort), 850 vp => (new CFClient::UI::ViewPort expand => 1),
768 slider => $slider, 851 slider => $slider,
769 @_, 852 @_,
770 ); 853 );
771 854
772 $self->{vp}->add ($self->{scrolled}); 855 $self->{vp}->add ($self->{scrolled});
… …
774 $self->add ($self->{slider}); 857 $self->add ($self->{slider});
775 858
776 $self 859 $self
777} 860}
778 861
862sub size_allocate {
863 my ($self, $w, $h) = @_;
864
865 $self->SUPER::size_allocate ($w, $h);
866
867 my $child = $self->{vp}->child;
868 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
869}
870
779#TODO# update range on size_allocate depeneing on child 871#TODO# update range on size_allocate depending on child
780# update viewport offset on scroll 872# update viewport offset on scroll
781 873
782############################################################################# 874#############################################################################
783 875
784package CFClient::UI::Frame; 876package CFClient::UI::Frame;
… …
788use CFClient::OpenGL; 880use CFClient::OpenGL;
789 881
790sub new { 882sub new {
791 my $class = shift; 883 my $class = shift;
792 884
793 my $self = $class->SUPER::new ( 885 $class->SUPER::new (
794 bg => [1, 1, 1, 1], 886 bg => undef,
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_ 887 @_,
798 ); 888 )
799
800 $self
801} 889}
802 890
803sub _draw { 891sub _draw {
804 my ($self) = @_; 892 my ($self) = @_;
805 893
806 my ($w, $h) = ($self->{w}, $self->{h}); 894 if ($self->{bg}) {
895 my ($w, $h) = @$self{qw(w h)};
807 896
808 glEnable GL_BLEND; 897 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 898 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D; 899 glColor @{ $self->{bg} };
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 900
813# glBegin GL_QUADS; 901 glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0; 902 glVertex 0 , 0;
816# glVertex 0 , $h; 903 glVertex 0 , $h;
817# glVertex $w, $h; 904 glVertex $w, $h;
818# glVertex $w, 0; 905 glVertex $w, 0;
819# glEnd; 906 glEnd;
820 907
821
822 $self->child->draw;
823 glDisable GL_BLEND; 908 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D; 909 }
910
911 $self->SUPER::_draw;
825} 912}
826 913
827############################################################################# 914#############################################################################
828 915
829package CFClient::UI::FancyFrame; 916package CFClient::UI::FancyFrame;
… …
840 my $class = shift; 927 my $class = shift;
841 928
842 # TODO: user_x, user_y, overwrite moveto? 929 # TODO: user_x, user_y, overwrite moveto?
843 930
844 my $self = $class->SUPER::new ( 931 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1], 932 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1], 933 border_bg => [1, 1, 1, 1],
847 border => 0.6, 934 border => 0.6,
935 is_toplevel => 1,
848 can_events => 1, 936 can_events => 1,
849 @_ 937 @_
850 ); 938 );
851 939
852 $self->{title} &&= new CFClient::UI::Label 940 $self->{title} &&= new CFClient::UI::Label
853 align => 0, 941 align => 0,
… …
877 my ($self, $w, $h) = @_; 965 my ($self, $w, $h) = @_;
878 966
879 $h -= List::Util::max 0, $self->border * 2; 967 $h -= List::Util::max 0, $self->border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 968 $w -= List::Util::max 0, $self->border * 2;
881 969
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 970 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
883 if $self->{title}; 971 if $self->{title};
884 972
885 $self->child->configure ($self->border, $self->border, $w, $h); 973 $self->child->configure ($self->border, $self->border, $w, $h);
886} 974}
887 975
… …
945 my ($self) = @_; 1033 my ($self) = @_;
946 1034
947 my ($w, $h ) = ($self->{w}, $self->{h}); 1035 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1036 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949 1037
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 1038 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 1040
955 my $border = $self->border; 1041 my $border = $self->border;
956 1042
957 glColor @{ $self->{border_bg} }; 1043 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962 1048
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 1050 my $bg = $tex[0];
965 1051
966 # TODO: repeat texture not scale 1052 # TODO: repeat texture not scale
… …
970 glColor @{ $self->{bg} }; 1056 glColor @{ $self->{bg} };
971 1057
972 $bg->{s} = $rep_x; 1058 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y; 1059 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1; 1060 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1061 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 }
976 1063
977 glDisable GL_TEXTURE_2D; 1064 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1065
981 $self->{title}->draw if $self->{title}; 1066 $self->{title}->draw if $self->{title};
982 1067
983 $self->child->draw; 1068 $self->child->draw;
984} 1069}
… …
1251 1336
1252############################################################################# 1337#############################################################################
1253 1338
1254package CFClient::UI::Label; 1339package CFClient::UI::Label;
1255 1340
1256our @ISA = CFClient::UI::Base::; 1341our @ISA = CFClient::UI::DrawBG::;
1257 1342
1258use CFClient::OpenGL; 1343use CFClient::OpenGL;
1259 1344
1260sub new { 1345sub new {
1261 my ($class, %arg) = @_; 1346 my ($class, %arg) = @_;
1262 1347
1263 my $self = $class->SUPER::new ( 1348 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1349 fg => [1, 1, 1],
1350 #bg => none
1351 #active_bg => none
1265 #font => default_font 1352 #font => default_font
1266 #text => initial text 1353 #text => initial text
1267 #markup => initial narkup 1354 #markup => initial narkup
1355 #max_w => maximum pixel width
1356 ellipsise => 3, # end
1268 layout => (new CFClient::Layout), 1357 layout => (new CFClient::Layout),
1269 fontsize => 1, 1358 fontsize => 1,
1270 align => -1, 1359 align => -1,
1271 valign => -1, 1360 valign => -1,
1272 padding => 2, 1361 padding => 2,
… …
1287 } 1376 }
1288 1377
1289 $self 1378 $self
1290} 1379}
1291 1380
1292sub escape { 1381sub escape($) {
1293 local $_ = $_[1]; 1382 local $_ = $_[0];
1294 1383
1295 s/&/&amp;/g; 1384 s/&/&amp;/g;
1296 s/>/&gt;/g; 1385 s/>/&gt;/g;
1297 s/</&lt;/g; 1386 s/</&lt;/g;
1298 1387
1299 $_[1] 1388 $_
1300} 1389}
1301 1390
1302sub update { 1391sub update {
1303 my ($self) = @_; 1392 my ($self) = @_;
1304 1393
… …
1337sub size_request { 1426sub size_request {
1338 my ($self) = @_; 1427 my ($self) = @_;
1339 1428
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1429 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $self->{layout}->set_width ($self->{max_w} || -1); 1430 $self->{layout}->set_width ($self->{max_w} || -1);
1431 $self->{layout}->set_ellipsise ($self->{ellipsise});
1432 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1433 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1434
1344 my ($w, $h) = $self->{layout}->size; 1435 my ($w, $h) = $self->{layout}->size;
1345 1436
1346 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1376} 1467}
1377 1468
1378sub _draw { 1469sub _draw {
1379 my ($self) = @_; 1470 my ($self) = @_;
1380 1471
1472 $self->SUPER::_draw; # draw background, if applicable
1473
1381 my $tex = $self->{texture} ||= do { 1474 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1475 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1476 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $self->{layout}->set_width ($self->{w}); 1477 $self->{layout}->set_width ($self->{w});
1478 $self->{layout}->set_ellipsise ($self->{ellipsise});
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1481
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1482 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388 1483
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5; 1486 : ($self->{w} - $tex->{w}) * 0.5);
1392 1487
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5; 1490 : ($self->{h} - $tex->{h}) * 0.5);
1396 1491
1397 $tex 1492 $tex
1398 }; 1493 };
1399 1494
1400 glEnable GL_TEXTURE_2D; 1495 glEnable GL_TEXTURE_2D;
… …
1428 active_fg => [0, 0, 0], 1523 active_fg => [0, 0, 0],
1429 can_hover => 1, 1524 can_hover => 1,
1430 can_focus => 1, 1525 can_focus => 1,
1431 valign => 0, 1526 valign => 0,
1432 can_events => 1, 1527 can_events => 1,
1528 #text => ...
1433 @_ 1529 @_
1434 ) 1530 )
1435} 1531}
1436 1532
1437sub _set_text { 1533sub _set_text {
… …
1447 $self->{text} = $text; 1543 $self->{text} = $text;
1448 1544
1449 $text =~ s/./*/g if $self->{hidden}; 1545 $text =~ s/./*/g if $self->{hidden};
1450 $self->{layout}->set_text ("$text "); 1546 $self->{layout}->set_text ("$text ");
1451 1547
1452 $self->emit (changed => $self->{text}); 1548 $self->_emit (changed => $self->{text});
1453} 1549}
1454 1550
1455sub set_text { 1551sub set_text {
1456 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1457 1553
1458 $self->{cursor} = length $text; 1554 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1555 $self->_set_text ($text);
1556 $self->update;
1460 $self->check_size; 1557 $self->check_size;
1461 $self->update;
1462} 1558}
1463 1559
1464sub get_text { 1560sub get_text {
1465 $_[0]{text} 1561 $_[0]{text}
1466} 1562}
… …
1469 my ($self) = @_; 1565 my ($self) = @_;
1470 1566
1471 my ($w, $h) = $self->SUPER::size_request; 1567 my ($w, $h) = $self->SUPER::size_request;
1472 1568
1473 ($w + 1, $h) # add 1 for cursor 1569 ($w + 1, $h) # add 1 for cursor
1474}
1475
1476sub size_allocate {
1477 my ($self, $w, $h) = @_;
1478
1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1480} 1570}
1481 1571
1482sub key_down { 1572sub key_down {
1483 my ($self, $ev) = @_; 1573 my ($self, $ev) = @_;
1484 1574
… …
1486 my $sym = $ev->{sym}; 1576 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1577 my $uni = $ev->{unicode};
1488 1578
1489 my $text = $self->get_text; 1579 my $text = $self->get_text;
1490 1580
1491 if ($sym == 8) { 1581 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1582 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1583 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1584 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1585 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1586 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1587 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1588 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1589 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1590 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1591 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1592 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1593 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1594 $self->_emit ('escape');
1505 } elsif ($uni) { 1595 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1596 substr $text, $self->{cursor}++, 0, chr $uni;
1507 } 1597 }
1508 1598
1509 $self->_set_text ($text); 1599 $self->_set_text ($text);
1510 $self->update; 1600 $self->update;
1601 $self->check_size;
1511} 1602}
1512 1603
1513sub focus_in { 1604sub focus_in {
1514 my ($self) = @_; 1605 my ($self) = @_;
1515 1606
… …
1595 if ($sym == 13) { 1686 if ($sym == 13) {
1596 unshift @{$self->{history}}, 1687 unshift @{$self->{history}},
1597 my $txt = $self->get_text; 1688 my $txt = $self->get_text;
1598 $self->{history_pointer} = -1; 1689 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = ''; 1690 $self->{history_saveback} = '';
1600 $self->emit (activate => $txt); 1691 $self->_emit (activate => $txt);
1601 $self->update; 1692 $self->update;
1602 1693
1603 } elsif ($sym == CFClient::SDLK_UP) { 1694 } elsif ($sym == CFClient::SDLK_UP) {
1604 if ($self->{history_pointer} < 0) { 1695 if ($self->{history_pointer} < 0) {
1605 $self->{history_saveback} = $self->get_text; 1696 $self->{history_saveback} = $self->get_text;
… …
1644 my $class = shift; 1735 my $class = shift;
1645 1736
1646 $class->SUPER::new ( 1737 $class->SUPER::new (
1647 padding => 4, 1738 padding => 4,
1648 fg => [1, 1, 1], 1739 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1740 active_fg => [0, 0, 1],
1651 can_hover => 1, 1741 can_hover => 1,
1652 align => 0, 1742 align => 0,
1653 valign => 0, 1743 valign => 0,
1654 can_events => 1, 1744 can_events => 1,
1655 @_ 1745 @_
1656 ) 1746 )
1657} 1747}
1658 1748
1749sub activate { }
1750
1659sub button_up { 1751sub button_up {
1660 my ($self, $ev, $x, $y) = @_; 1752 my ($self, $ev, $x, $y) = @_;
1661 1753
1754 $self->emit ("activate")
1662 if ($x >= 0 && $x < $self->{w} 1755 if $x >= 0 && $x < $self->{w}
1663 && $y >= 0 && $y < $self->{h}) { 1756 && $y >= 0 && $y < $self->{h};
1664 $self->emit ("activate");
1665 }
1666} 1757}
1667 1758
1668sub _draw { 1759sub _draw {
1669 my ($self) = @_; 1760 my ($self) = @_;
1670 1761
… …
1702 1793
1703 $class->SUPER::new ( 1794 $class->SUPER::new (
1704 padding => 2, 1795 padding => 2,
1705 fg => [1, 1, 1], 1796 fg => [1, 1, 1],
1706 active_fg => [1, 1, 0], 1797 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5],
1707 state => 0, 1800 state => 0,
1708 can_hover => 1, 1801 can_hover => 1,
1709 @_ 1802 @_
1710 ) 1803 )
1711} 1804}
… …
1720 my ($self, $ev, $x, $y) = @_; 1813 my ($self, $ev, $x, $y) = @_;
1721 1814
1722 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1723 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1724 $self->{state} = !$self->{state}; 1817 $self->{state} = !$self->{state};
1725 $self->emit (changed => $self->{state}); 1818 $self->_emit (changed => $self->{state});
1726 } 1819 }
1727} 1820}
1728 1821
1729sub _draw { 1822sub _draw {
1730 my ($self) = @_; 1823 my ($self) = @_;
… …
1735 1828
1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1829 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1737 1830
1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1739 1832
1833 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834
1740 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1741
1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1743
1744 $tex->draw_quad_alpha (0, 0, $s, $s); 1836 $tex->draw_quad_alpha (0, 0, $s, $s);
1745
1746 glDisable GL_TEXTURE_2D; 1837 glDisable GL_TEXTURE_2D;
1747} 1838}
1748 1839
1749############################################################################# 1840#############################################################################
1750 1841
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2088 qw(s1_slider.png s1_slider_bg.png);
1998 2089
1999sub new { 2090sub new {
2000 my $class = shift; 2091 my $class = shift;
2001 2092
2002 # range [value, low, high, page] 2093 # range [value, low, high, page, unit]
2003 2094
2004 # TODO: 0-width page 2095 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2096 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2097 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2098 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2099 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2100 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2103 range => [0, 0, 100, 10, 0],
2011 req_w => $::WIDTH / 80, 2104 req_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2105 req_h => $::WIDTH / 80,
2013 vertical => 0, 2106 vertical => 0,
2014 can_hover => 1, 2107 can_hover => 1,
2015 inner_pad => 5, 2108 inner_pad => 0.02,
2016 @_ 2109 @_
2017 ); 2110 );
2018 2111
2112 $self->set_value ($self->{range}[0]);
2113 $self->update;
2114
2019 $self 2115 $self
2116}
2117
2118sub set_range {
2119 my ($self, $range) = @_;
2120
2121 $self->{range} = $range;
2122
2123 $self->update;
2124}
2125
2126sub set_value {
2127 my ($self, $value) = @_;
2128
2129 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2130
2131 $hi = $lo + 1 if $hi <= $lo;
2132
2133 $page = $hi - $lo if $page > $hi - $lo;
2134
2135 $value = $lo if $value < $lo;
2136 $value = $hi - $page if $value > $hi - $page;
2137
2138 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2139 if $unit;
2140
2141 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2142
2143 if ($value != $old_value) {
2144 $self->_emit (changed => $value);
2145 $self->update;
2146 }
2020} 2147}
2021 2148
2022sub size_request { 2149sub size_request {
2023 my ($self) = @_; 2150 my ($self) = @_;
2024 2151
… …
2030 2157
2031sub button_down { 2158sub button_down {
2032 my ($self, $ev, $x, $y) = @_; 2159 my ($self, $ev, $x, $y) = @_;
2033 2160
2034 $self->SUPER::button_down ($ev, $x, $y); 2161 $self->SUPER::button_down ($ev, $x, $y);
2162
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164
2035 $self->mouse_motion ($ev, $x, $y); 2165 $self->mouse_motion ($ev, $x, $y);
2036} 2166}
2037 2167
2038sub mouse_motion { 2168sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2169 my ($self, $ev, $x, $y) = @_;
2040 2170
2041 if ($GRAB == $self) { 2171 if ($GRAB == $self) {
2172 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2173
2174 my (undef, $lo, $hi, $page) = @{$self->{range}};
2175
2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2177
2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2179 }
2180}
2181
2182sub update {
2183 my ($self) = @_;
2184
2185 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2186 $self->set_value ($self->{range}[0]);
2187
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2188 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100;
2043 2190
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2191 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045 2192
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2193 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2194 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048 2195
2049 $x -= $inner_pad_px; # substract the padding 2196 $value = ($value - $lo) / $range;
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2197 $value = $value * $self->{scale} + $self->{offset};
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2198
2055 $self->emit (changed => $x); 2199 $self->{knob_x} = $value - $knob_w * 0.5;
2056 $self->update; 2200 $self->{knob_w} = $knob_w;
2057 } 2201 });
2058}
2059 2202
2060# the inner_* stuff is for generating a padding for the slider handle, 2203 $self->SUPER::update;
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066} 2204}
2067 2205
2068sub _draw { 2206sub _draw {
2069 my ($self) = @_; 2207 my ($self) = @_;
2070 2208
2071 $self->SUPER::_draw (); 2209 $self->SUPER::_draw ();
2072 2210
2073 my ($w, $h) = @$self{qw(w h)}; 2211 glScale $self->{w}, $self->{h};
2074 2212
2075 if ($self->{vertical}) { 2213 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2214 # draw a vertical slider like a rotated horizontal slider
2077 2215
2216 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2217 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2218 }
2083 2219
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2220 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2221 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2222
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_TEXTURE_2D; 2223 glEnable GL_TEXTURE_2D;
2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2107 2225
2108 # draw background 2226 # draw background
2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2227 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2110 2228
2111 # draw handle 2229 # draw handle
2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2230 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2113 2231
2114 glDisable GL_TEXTURE_2D; 2232 glDisable GL_TEXTURE_2D;
2115} 2233}
2234
2235#############################################################################
2236
2237package CFClient::UI::ValSlider;
2238
2239our @ISA = CFClient::UI::HBox::;
2240
2241sub new {
2242 my ($class, %arg) = @_;
2243
2244 my $range = delete $arg{range};
2245
2246 my $self = $class->SUPER::new (
2247 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2248 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2249 to_value => sub { shift },
2250 from_value => sub { shift },
2251 %arg,
2252 );
2253
2254 $self->{slider}->connect (changed => sub {
2255 my ($self, $value) = @_;
2256 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2257 $self->{parent}->emit (changed => $value);
2258 });
2259
2260# $self->{entry}->connect (changed => sub {
2261# my ($self, $value) = @_;
2262# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2263# $self->{parent}->emit (changed => $value);
2264# });
2265
2266 $self->add ($self->{slider}, $self->{entry});
2267
2268 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2269
2270 $self
2271}
2272
2273sub set_range { shift->{slider}->set_range (@_) }
2274sub set_value { shift->{slider}->set_value (@_) }
2116 2275
2117############################################################################# 2276#############################################################################
2118 2277
2119package CFClient::UI::TextView; 2278package CFClient::UI::TextView;
2120 2279
… …
2150 2309
2151 $self->{fontsize} = $fontsize; 2310 $self->{fontsize} = $fontsize;
2152 $self->reflow; 2311 $self->reflow;
2153} 2312}
2154 2313
2155sub text_height {
2156 my ($self, $text) = @_;
2157
2158 my $layout = $self->{layout};
2159
2160 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2161 $layout->set_width ($self->{children}[0]{w});
2162 $layout->set_markup ($text);
2163
2164 ($layout->size)[1]
2165}
2166
2167sub reflow {
2168 my ($self) = @_;
2169
2170 $self->{need_reflow}++;
2171 $self->update;
2172}
2173
2174sub size_allocate { 2314sub size_allocate {
2175 my ($self, $w, $h) = @_; 2315 my ($self, $w, $h) = @_;
2176 2316
2177 $self->SUPER::size_allocate ($w, $h); 2317 $self->SUPER::size_allocate ($w, $h);
2178 2318
… …
2181 $self->{layout}->set_width ($self->{children}[0]{w}); 2321 $self->{layout}->set_width ($self->{children}[0]{w});
2182 2322
2183 $self->reflow; 2323 $self->reflow;
2184} 2324}
2185 2325
2326sub text_size {
2327 my ($self, $text, $indent) = @_;
2328
2329 my $layout = $self->{layout};
2330
2331 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2332 $layout->set_width ($self->{children}[0]{w} - $indent);
2333 $layout->set_markup ($text);
2334
2335 $layout->size
2336}
2337
2338sub reflow {
2339 my ($self) = @_;
2340
2341 $self->{need_reflow}++;
2342 $self->update;
2343}
2344
2345sub set_offset {
2346 my ($self, $offset) = @_;
2347
2348 # todo: base offset on lines or so, not on pixels
2349 $self->{children}[1]->set_value ($offset);
2350}
2351
2352sub clear {
2353 my ($self) = @_;
2354
2355 $self->{par} = [];
2356 $self->{height} = 0;
2357 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2358}
2359
2186sub add_paragraph { 2360sub add_paragraph {
2187 my ($self, $color, $text) = @_; 2361 my ($self, $color, $text, $indent) = @_;
2188 2362
2189 #TODO: intelligently "reformat" paragraph 2363 for my $line (split /\n/, $text) {
2190 2364 my ($w, $h) = $self->text_size ($line);
2191 my $height = $self->text_height ($text);
2192
2193 $self->{height} += $height; 2365 $self->{height} += $h;
2366 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2367 }
2194 2368
2195 push @{$self->{par}}, [$height, $color, $text];
2196
2197 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2369 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2198 $self->{children}[1]->update;
2199} 2370}
2200 2371
2201sub update { 2372sub update {
2202 my ($self) = @_; 2373 my ($self) = @_;
2203 2374
… …
2205 2376
2206 return unless $self->{h} > 0; 2377 return unless $self->{h} > 0;
2207 2378
2208 delete $self->{texture}; 2379 delete $self->{texture};
2209 2380
2210 $ROOT->on_refresh ($self, sub { 2381 $ROOT->on_post_alloc ($self, sub {
2382 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2383
2211 if (delete $self->{need_reflow}) { 2384 if (delete $self->{need_reflow}) {
2212 my $height = 0; 2385 my $height = 0;
2213 2386
2214 $height += $_->[0] = $self->text_height ($_->[2]) 2387 my $layout = $self->{layout};
2388
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390
2215 for @{$self->{par}}; 2391 for (@{$self->{par}}) {
2392 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2393 $layout->set_width ($W - $_->[3]);
2394 $layout->set_markup ($_->[4]);
2395 my ($w, $h) = $layout->size;
2396 $_->[0] = $w + $_->[3];
2397 $_->[1] = $h;
2398 }
2399
2400 $height += $_->[1];
2401 }
2216 2402
2217 $self->{height} = $height; 2403 $self->{height} = $height;
2218 2404
2219 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2405 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2220 2406
2221 delete $self->{texture}; 2407 delete $self->{texture};
2222 } 2408 }
2223 2409
2224 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2410 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2225 glClearColor 0, 0, 0, 0; 2411 glClearColor 0.5, 0.5, 0.5, 0;
2226 glClear GL_COLOR_BUFFER_BIT; 2412 glClear GL_COLOR_BUFFER_BIT;
2227 2413
2228 glEnable GL_TEXTURE_2D;
2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230
2231 my $top = int $self->{children}[1]{range}[0]; 2414 my $top = int $self->{children}[1]{range}[0];
2232 2415
2233 my $y0 = $top; 2416 my $y0 = $top;
2234 my $y1 = $top + $self->{h}; 2417 my $y1 = $top + $H;
2235 2418
2236 my $y = 0; 2419 my $y = 0;
2237 2420
2238 my $layout = $self->{layout}; 2421 my $layout = $self->{layout};
2239 2422
2240 $layout->set_font ($self->{font}) if $self->{font}; 2423 $layout->set_font ($self->{font}) if $self->{font};
2241 2424
2425 glEnable GL_BLEND;
2426 #TODO# not correct in windows where rgba is forced off
2427 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2428
2242 for my $par (@{$self->{par}}) { 2429 for my $par (@{$self->{par}}) {
2243 my $h = $par->[0]; 2430 my $h = $par->[1];
2244 2431
2245 if ($y0 < $y + $h && $y < $y1) { 2432 if ($y0 < $y + $h && $y < $y1) {
2246 $layout->set_foreground (@{ $par->[1] }); 2433 $layout->set_foreground (@{ $par->[2] });
2434 $layout->set_width ($W - $par->[3]);
2247 $layout->set_markup ($par->[2]); 2435 $layout->set_markup ($par->[4]);
2248 2436
2249 my ($W, $H) = $layout->size; 2437 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2250 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2438
2439 glRasterPos $par->[3], $y - $y0;
2440 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2251 } 2441 }
2252 2442
2253 $y += $h; 2443 $y += $h;
2254 } 2444 }
2255 2445
2256 glDisable GL_TEXTURE_2D; 2446 glDisable GL_BLEND;
2257 }; 2447 };
2258 }); 2448 });
2259} 2449}
2260 2450
2261sub _draw { 2451sub _draw {
2262 my ($self) = @_; 2452 my ($self) = @_;
2263 2453
2264 glEnable GL_TEXTURE_2D; 2454 glEnable GL_TEXTURE_2D;
2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266 glColor 1, 1, 1, 1; 2456 glColor 1, 1, 1, 1;
2267 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2457 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2268 glDisable GL_TEXTURE_2D; 2458 glDisable GL_TEXTURE_2D;
2269 2459
2270 $self->{children}[1]->draw; 2460 $self->{children}[1]->draw;
2271 2461
2272} 2462}
… …
2341 2531
2342 # TODO: use animation 2532 # TODO: use animation
2343 if ($self->{state} = !$self->{state}) { 2533 if ($self->{state} = !$self->{state}) {
2344 $CFClient::UI::ROOT->add ($self->{other}); 2534 $CFClient::UI::ROOT->add ($self->{other});
2345 $self->{other}->move ($self->coord2global (0, $self->{h})); 2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2346 $self->emit ("open"); 2536 $self->_emit ("open");
2347 } else { 2537 } else {
2348 $CFClient::UI::ROOT->remove ($self->{other}); 2538 $CFClient::UI::ROOT->remove ($self->{other});
2349 $self->emit ("close"); 2539 $self->_emit ("close");
2350 } 2540 }
2351 2541
2352 $self->emit (changed => $self->{state}); 2542 $self->_emit (changed => $self->{state});
2353} 2543}
2354 2544
2355############################################################################# 2545#############################################################################
2356 2546
2357package CFClient::UI::Tooltip; 2547package CFClient::UI::Tooltip;
… …
2367 @_, 2557 @_,
2368 can_events => 0, 2558 can_events => 0,
2369 ) 2559 )
2370} 2560}
2371 2561
2372sub set_markup { 2562sub set_tooltip_from {
2373 my ($self, $text, $font) = @_; 2563 my ($self, $widget) = @_;
2374 2564
2375 $self->{label} = new CFClient::UI::Label 2565 $self->add (new CFClient::UI::Label
2566 markup => $widget->{tooltip},
2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2376 fontsize => 0.8, 2568 fontsize => 0.8,
2377 fg => [0, 0, 0], 2569 fg => [0, 0, 0, 1],
2570 ellipsise => 0,
2378 font => ($font || $::FONT_PROP); 2571 font => ($widget->{tooltip_font} || $::FONT_PROP),
2379 2572 );
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2381 $self->{label}->set_markup ($text);
2382 $self->add ($self->{label});
2383} 2573}
2384 2574
2385sub size_request { 2575sub size_request {
2386 my ($self) = @_; 2576 my ($self) = @_;
2387 2577
… …
2397} 2587}
2398 2588
2399sub _draw { 2589sub _draw {
2400 my ($self) = @_; 2590 my ($self) = @_;
2401 2591
2402 glPushMatrix;
2403 glTranslate 0.375, 0.375; 2592 glTranslate 0.375, 0.375;
2404 2593
2405 my ($w, $h) = @$self{qw(w h)}; 2594 my ($w, $h) = @$self{qw(w h)};
2406 2595
2407 glColor 1, 0.8, 0.4; 2596 glColor 1, 0.8, 0.4;
… …
2418 glVertex 0 , $h; 2607 glVertex 0 , $h;
2419 glVertex $w, $h; 2608 glVertex $w, $h;
2420 glVertex $w, 0; 2609 glVertex $w, 0;
2421 glEnd; 2610 glEnd;
2422 2611
2423 glPopMatrix; 2612 glTranslate 2 - 0.375, 2 - 0.375;
2424
2425 glTranslate 2, 2;
2426 $self->SUPER::_draw; 2613 $self->SUPER::_draw;
2427} 2614}
2428 2615
2429############################################################################# 2616#############################################################################
2430 2617
… …
2435use CFClient::OpenGL; 2622use CFClient::OpenGL;
2436 2623
2437sub new { 2624sub new {
2438 my $class = shift; 2625 my $class = shift;
2439 2626
2440 $class->SUPER::new ( 2627 my $self = $class->SUPER::new (
2441 aspect => 1, 2628 aspect => 1,
2442 @_, 2629 @_,
2443 ) 2630 );
2631
2632 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self);
2634
2635 $self->{timer} = Event->timer (
2636 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2637 hard => 1,
2638 interval => $self->{animspeed},
2639 cb => sub {
2640 ++$widget->{frame};
2641 $widget->update;
2642 },
2643 );
2644 }
2645
2646 $self
2444} 2647}
2445 2648
2446sub size_request { 2649sub size_request {
2447 (32, 8) 2650 (32, 8)
2448} 2651}
2449 2652
2653sub update {
2654 my ($self) = @_;
2655
2656 return unless $self->{visible};
2657
2658 $self->SUPER::update;
2659}
2660
2450sub _draw { 2661sub _draw {
2451 my ($self) = @_; 2662 my ($self) = @_;
2452 2663
2453 return unless $::CONN;#d# manage and cache textures differently 2664 return unless $::CONN;
2665
2666 my $face;
2667
2668 if ($self->{frame}) {
2669 my $anim = $::CONN->{anim}[$self->{anim}];
2670
2671 $face = $anim->[ $self->{frame} % @$anim ]
2672 if $anim && @$anim;
2673 }
2674
2454 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2675 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2455 2676
2456 # TODO animation
2457 if ($tex) { 2677 if ($tex) {
2458 glEnable GL_TEXTURE_2D; 2678 glEnable GL_TEXTURE_2D;
2459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2460 glColor 1, 1, 1, 1; 2680 glColor 1, 1, 1, 1;
2461 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2681 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2462 glDisable GL_TEXTURE_2D; 2682 glDisable GL_TEXTURE_2D;
2463 } 2683 }
2464} 2684}
2465 2685
2686sub DESTROY {
2687 my ($self) = @_;
2688
2689 $self->{timer}->cancel
2690 if $self->{timer};
2691
2692 $self->SUPER::DESTROY;
2693}
2694
2466############################################################################# 2695#############################################################################
2467 2696
2468package CFClient::UI::InventoryItem; 2697package CFClient::UI::InventoryItem;
2469 2698
2470our @ISA = CFClient::UI::HBox::; 2699our @ISA = CFClient::UI::HBox::;
2700
2701sub _item_to_desc {
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2471 2726
2472sub new { 2727sub new {
2473 my $class = shift; 2728 my $class = shift;
2474 2729
2475 my %args = @_; 2730 my %args = @_;
2476 2731
2477 my $item = delete $args{item}; 2732 my $item = delete $args{item};
2478 2733
2479 my $desc = $item->{nrof} < 2 2734 my $desc = _item_to_desc ($item);
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483 2735
2484 my $self = $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
2485 can_hover => 1, 2737 can_hover => 1,
2486 can_events => 1, 2738 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc) 2739 tooltip => ((CFClient::UI::Label::escape $desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub { 2741 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_; 2742 my ($self, $ev, $x, $y) = @_;
2491 2743
2492 # todo: maybe put examine on 1? but should just be a tooltip :( 2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2493 if ($ev->{button} == 1) { 2753 } elsif ($ev->{button} == 1) {
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2754 $::CONN->send ("examine $item->{tag}");
2495 } elsif ($ev->{button} == 2) { 2755 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}"); 2756 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) { 2757 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new ( 2758 my @menu_items = (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2501 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") },
2504 ],
2505 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2508 ], 2771 ),
2509 )->popup ($ev); 2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2510 } 2775 }
2511 2776
2512 1 2777 1
2513 }, 2778 },
2514 %args 2779 %args
2515 ); 2780 );
2781
2516 2782
2517 $self->add (new CFClient::UI::Face 2783 $self->add (new CFClient::UI::Face
2518 can_events => 0, 2784 can_events => 0,
2519 face => $item->{face}, 2785 face => $item->{face},
2520 anim => $item->{anim}, 2786 anim => $item->{anim},
2521 animspeed => $item->{animspeed}, 2787 animspeed => $item->{animspeed},
2522 ); 2788 );
2523 2789
2524 $self->add (new CFClient::UI::Label 2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2525 can_events => 0, 2791
2526 text => $desc, 2792 $self->{item} = $item;
2527 ); 2793
2794 $self->update_item;
2528 2795
2529 $self 2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2530} 2805}
2531 2806
2532############################################################################# 2807#############################################################################
2533 2808
2534package CFClient::UI::Inventory; 2809package CFClient::UI::Inventory;
… …
2537 2812
2538sub new { 2813sub new {
2539 my $class = shift; 2814 my $class = shift;
2540 2815
2541 my $self = $class->SUPER::new ( 2816 my $self = $class->SUPER::new (
2542 scrolled => (new CFClient::UI::VBox), 2817 scrolled => (new CFClient::UI::Table),
2543 @_, 2818 @_,
2544 ); 2819 );
2545 2820
2546 $self 2821 $self
2547} 2822}
… …
2550 my ($self, $items) = @_; 2825 my ($self, $items) = @_;
2551 2826
2552 $self->{scrolled}->clear; 2827 $self->{scrolled}->clear;
2553 return unless $items; 2828 return unless $items;
2554 2829
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2830 my @items = sort {
2831 ($a->{type} <=> $b->{type})
2832 or ($a->{name} cmp $b->{name})
2833 } @$items;
2556 2834
2557 $self->{real_items} = \@items; 2835 $self->{real_items} = \@items;
2558 2836
2559 for my $item (@items) { 2837 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2 2838 $item->{item} = $item;
2561 ? $item->{name}
2562 : "$item->{nrof} $item->{name_pl}";
2563
2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842
2843 my $i = 0;
2844 for (@items) {
2845 $self->{scrolled}->add (0, $i, $_);
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2565 } 2848 }
2566 2849
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2568} 2851}
2569 2852
… …
2612 2895
2613# popup given the event (must be a mouse button down event currently) 2896# popup given the event (must be a mouse button down event currently)
2614sub popup { 2897sub popup {
2615 my ($self, $ev) = @_; 2898 my ($self, $ev) = @_;
2616 2899
2617 $self->emit ("popdown"); 2900 $self->_emit ("popdown");
2618 2901
2619 # maybe save $GRAB? must be careful about events... 2902 # maybe save $GRAB? must be careful about events...
2620 $GRAB = $self; 2903 $GRAB = $self;
2621 $self->{button} = $ev->{button}; 2904 $self->{button} = $ev->{button};
2622 2905
… …
2637 2920
2638 if ($ev->{button} == $self->{button}) { 2921 if ($ev->{button} == $self->{button}) {
2639 undef $GRAB; 2922 undef $GRAB;
2640 $self->hide; 2923 $self->hide;
2641 2924
2642 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2643 $self->{hover}[1]->() if $self->{hover}; 2926 $self->{hover}[1]->() if $self->{hover};
2644 } 2927 }
2645} 2928}
2646 2929
2647############################################################################# 2930#############################################################################
2648 2931
2649package CFClient::UI::Statusbox; 2932package CFClient::UI::Statusbox;
2650 2933
2651our @ISA = CFClient::UI::VBox::; 2934our @ISA = CFClient::UI::VBox::;
2935
2936sub new {
2937 my $class = shift;
2938
2939 $class->SUPER::new (
2940 fontsize => 0.8,
2941 @_,
2942 )
2943}
2652 2944
2653sub reorder { 2945sub reorder {
2654 my ($self) = @_; 2946 my ($self) = @_;
2655 my $NOW = time; 2947 my $NOW = time;
2656 2948
2657 while (my ($k, $v) = each %{ $self->{item} }) { 2949 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2950 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 } 2951 }
2660 2952
2661 my @widgets; 2953 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2954
2955 my @items = sort {
2956 $a->{pri} <=> $b->{pri}
2957 or $b->{id} <=> $a->{id}
2958 } values %{ $self->{item} };
2959
2663 my $count = 10 + 1; 2960 my $count = 10 + 1;
2664 for my $item (@items) { 2961 for my $item (@items) {
2665 last unless --$count; 2962 last unless --$count;
2666 2963
2667 push @widgets, $item->{label} ||= do { 2964 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all) 2965 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text}; 2966 my $short = $item->{count} > 1
2967 ? "<b>$item->{count} ×</b> $item->{text}"
2968 : $item->{text};
2969
2670 for ($short) { 2970 for ($short) {
2671 s/^\s+//; 2971 s/^\s+//;
2672 s/\012.*//s; 2972 s/\s+/ /g;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 } 2973 }
2676 2974
2677 new CFClient::UI::Label 2975 new CFClient::UI::Label
2678 markup => $short, 2976 markup => $short,
2679 tooltip => delete $item->{tooltip}, 2977 tooltip => $item->{tooltip},
2680 fontsize => delete $item->{fontsize}, 2978 tooltip_font => $::FONT_PROP,
2681 color => delete $item->{color}, 2979 tooltip_width => 0.67,
2980 fontsize => $item->{fontsize} || $self->{fontsize},
2981 max_w => $::WIDTH * 0.44,
2982 fg => $item->{fg},
2682 can_events => 1, 2983 can_events => 1,
2683 can_hover => 1, 2984 can_hover => 1
2684 }; 2985 };
2685 } 2986 }
2686 2987
2687 $self->clear; 2988 $self->clear;
2688 $self->SUPER::add (@widgets); 2989 $self->SUPER::add (reverse @widgets);
2689} 2990}
2690 2991
2691sub add { 2992sub add {
2692 my ($self, $text, %arg) = @_; 2993 my ($self, $text, %arg) = @_;
2693 2994
2694 my $item = { 2995 $text =~ s/^\s+//;
2695 time => time, 2996 $text =~ s/\s+$//;
2997
2998 return unless $text;
2999
3000 my $timeout = time + ((delete $arg{timeout}) || 60);
3001
3002 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3003
3004 if (my $item = $self->{item}{$group}) {
3005 if ($item->{text} eq $text) {
3006 $item->{count}++;
3007 } else {
3008 $item->{count} = 1;
3009 $item->{text} = $item->{tooltip} = $text;
3010 }
3011 $item->{id} = ++$self->{id};
3012 $item->{timeout} = $timeout;
3013 delete $item->{label};
3014 } else {
3015 $self->{item}{$group} = {
3016 id => ++$self->{id},
2696 text => $text, 3017 text => $text,
2697 timeout => 60, 3018 timeout => $timeout,
2698 tooltip => $text, 3019 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8], 3020 fg => [0.8, 0.8, 0.8, 0.8],
3021 pri => 0,
3022 count => 1,
2701 %arg, 3023 %arg,
3024 };
2702 }; 3025 }
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708 3026
2709 $self->reorder; 3027 $self->reorder;
3028}
3029
3030sub reconfigure {
3031 my ($self) = @_;
3032
3033 delete $_->{label}
3034 for values %{ $self->{item} || {} };
3035
3036 $self->reorder;
3037 $self->SUPER::reconfigure;
2710} 3038}
2711 3039
2712############################################################################# 3040#############################################################################
2713 3041
2714package CFClient::UI::Root; 3042package CFClient::UI::Root;
… …
2746} 3074}
2747 3075
2748sub size_allocate { 3076sub size_allocate {
2749 my ($self, $w, $h) = @_; 3077 my ($self, $w, $h) = @_;
2750 3078
2751 my $old_w = $self->{old_w};
2752 my $old_h = $self->{old_h};
2753
2754 if ($old_w && $old_h) {
2755 for my $child ($self->children) {
2756 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764 }
2765 }
2766
2767 for my $child ($self->children) { 3079 for my $child ($self->children) {
2768 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3080 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2769 3081
3082 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3083 if exists $child->{req_x};
3084
3085 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3086 if exists $child->{req_y};
3087
2770 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3088 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2771 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3089 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3090
2772 $child->configure ($X, $Y, $W, $H); 3091 $child->configure ($X, $Y, $W, $H);
2773 } 3092 }
2774
2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777} 3093}
2778 3094
2779sub coord2local { 3095sub coord2local {
2780 my ($self, $x, $y) = @_; 3096 my ($self, $x, $y) = @_;
2781 3097
… …
2794 $self->check_size; 3110 $self->check_size;
2795 $::WANT_REFRESH++; 3111 $::WANT_REFRESH++;
2796} 3112}
2797 3113
2798sub add { 3114sub add {
2799 my ($self, $child) = @_; 3115 my ($self, @children) = @_;
2800 3116
3117 for (my @widgets = @children; my $w = pop @widgets; ) {
3118 push @widgets, $w->children;
3119 $w->{root} = $self;
3120 $w->{visible} = 1;
3121 }
3122
3123 for my $child (@children) {
3124 $child->{is_toplevel} = 1;
3125
2801 # integerise window positions 3126 # integerise window positions
2802 $child->{x} = int $child->{x}; 3127 $child->{x} = int $child->{x};
2803 $child->{y} = int $child->{y}; 3128 $child->{y} = int $child->{y};
3129 }
2804 3130
2805 $self->SUPER::add ($child); 3131 $self->SUPER::add (@children);
3132}
3133
3134sub remove {
3135 my ($self, @children) = @_;
3136
3137 $self->SUPER::remove (@children);
3138
3139 while (@children) {
3140 my $w = pop @children;
3141 push @children, $w->children;
3142 $w->set_invisible;
3143 }
2806} 3144}
2807 3145
2808sub on_refresh { 3146sub on_refresh {
2809 my ($self, $id, $cb) = @_; 3147 my ($self, $id, $cb) = @_;
2810 3148
2811 $self->{refresh_hook}{$id} = $cb; 3149 $self->{refresh_hook}{$id} = $cb;
2812} 3150}
2813 3151
3152sub on_post_alloc {
3153 my ($self, $id, $cb) = @_;
3154
3155 $self->{post_alloc_hook}{$id} = $cb;
3156}
3157
2814sub draw { 3158sub draw {
2815 my ($self) = @_; 3159 my ($self) = @_;
3160
3161 while ($self->{refresh_hook}) {
3162 $_->()
3163 for values %{delete $self->{refresh_hook}};
3164 }
2816 3165
2817 if ($self->{check_size}) { 3166 if ($self->{check_size}) {
2818 my @queue = ([], []); 3167 my @queue = ([], []);
2819 3168
2820 for (;;) { 3169 for (;;) {
… …
2828 3177
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3178 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)} 3179 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request; 3180 : $widget->size_request;
2832 3181
3182 if (delete $widget->{force_alloc}
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3183 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3184 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835 3185
2836 $widget->{req_w} = $w; 3186 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h; 3187 $widget->{req_h} = $h;
2838 3188
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3189 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2840 3190
2841 $widget->{parent}->check_size 3191 $widget->{parent}->check_size
2842 if $widget->{parent}; 3192 if $widget->{parent};
2843 } 3193 }
2844 } 3194 }
… …
2851 $w = 0 if $w < 0; 3201 $w = 0 if $w < 0;
2852 $h = 0 if $h < 0; 3202 $h = 0 if $h < 0;
2853 3203
2854 $widget->{w} = $w; 3204 $widget->{w} = $w;
2855 $widget->{h} = $h; 3205 $widget->{h} = $h;
2856 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h); 3206 $widget->emit (size_allocate => $w, $h);
2858 } 3207 }
2859 } 3208 }
2860 3209
2861 while ($self->{refresh_hook}) { 3210 while ($self->{post_alloc_hook}) {
2862 $_->() 3211 $_->()
2863 for values %{delete $self->{refresh_hook}}; 3212 for values %{delete $self->{post_alloc_hook}};
2864 } 3213 }
2865 3214
2866 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3215 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3216 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2868 glClear GL_COLOR_BUFFER_BIT; 3217 glClear GL_COLOR_BUFFER_BIT;
2869 3218
2870 glMatrixMode GL_PROJECTION; 3219 glMatrixMode GL_PROJECTION;
2871 glLoadIdentity; 3220 glLoadIdentity;
2872 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3221 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2873 glMatrixMode GL_MODELVIEW; 3222 glMatrixMode GL_MODELVIEW;
2874 glLoadIdentity; 3223 glLoadIdentity;
2875 3224
2876 $self->_draw; 3225 $self->_draw;
2877} 3226}
… …
2879############################################################################# 3228#############################################################################
2880 3229
2881package CFClient::UI; 3230package CFClient::UI;
2882 3231
2883$ROOT = new CFClient::UI::Root; 3232$ROOT = new CFClient::UI::Root;
2884$TOOLTIP = new CFClient::UI::Tooltip; 3233$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2885 3234
28861 32351
2887 3236

Diff Legend

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