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.154 by root, Sun Apr 23 02:20:57 2006 UTC vs.
Revision 1.222 by root, Mon May 22 03:59:51 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
15 16
17our %WIDGET; # all widgets, weak-referenced
18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
20 23
21 if ($TOOLTIP->{owner} != $widget) { 24 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 25 $TOOLTIP->{owner} = $widget;
26
27 my $tip = $widget->{tooltip};
28
29 $tip = $tip->($widget) if CODE:: eq ref $tip;
30
23 $TOOLTIP->set_text ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25 $TOOLTIP->show; 32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
26 } 42 }
27 43
28 return; 44 return;
29 } 45 }
30 } 46 }
… …
34 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
35} 51}
36 52
37# class methods for events 53# class methods for events
38sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
56 if $FOCUS;
40} 57}
41 58
42sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
61 if $FOCUS;
44} 62}
45 63
46sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
47 my ($ev) = @_; 65 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 check_tooltip; 74 check_tooltip;
57 } 75 }
58 76
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 78
61 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 79 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y);
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
62} 83}
63 84
64sub feed_sdl_button_up_event { 85sub feed_sdl_button_up_event {
65 my ($ev) = @_; 86 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 87 my ($x, $y) = ($ev->{x}, $ev->{y});
67 88
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 89 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 90
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 92
72 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 93 if ($GRAB) {
94 ($x, $y) = $GRAB->coord2local ($x, $y);
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
73 97
74 if (!$BUTTON_STATE) { 98 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 99 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 100 $grab->update if $grab;
77 $GRAB->update if $GRAB; 101 $GRAB->update if $GRAB;
… …
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 117 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 118
95 check_tooltip; 119 check_tooltip;
96 } 120 }
97 121
98 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125 }
99} 126}
100 127
101# convert position array to integers 128# convert position array to integers
102sub harmonize { 129sub harmonize {
103 my ($vals) = @_; 130 my ($vals) = @_;
… …
109 $rem += $_ - $i; 136 $rem += $_ - $i;
110 $_ = $i; 137 $_ = $i;
111 } 138 }
112} 139}
113 140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
149# call when resolution changes etc.
150sub rescale_widgets {
151 my ($sx, $sy) = @_;
152
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167
168 $widget->reconfigure;
169 }
170}
171
114############################################################################# 172#############################################################################
115 173
116package CFClient::UI::Base; 174package CFClient::UI::Base;
117 175
118use strict; 176use strict;
… …
121 179
122sub new { 180sub new {
123 my $class = shift; 181 my $class = shift;
124 182
125 my $self = bless { 183 my $self = bless {
126 x => 0, 184 x => 0,
127 y => 0, 185 y => 0,
128 z => 0, 186 z => 0,
129 can_events => 1, 187 can_events => 1,
130 @_ 188 @_
131 }, $class; 189 }, $class;
132 190
133 for (keys %$self) { 191 for (keys %$self) {
134 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
135 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
136 } 194 }
137 } 195 }
138 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
139 $self 199 $self
140} 200}
141 201
202sub destroy {
203 my ($self) = @_;
204
205 $self->hide;
206 %$self = ();
207}
208
142sub show { 209sub show {
143 my ($self) = @_; 210 my ($self) = @_;
144
145 return if $self->{parent}; 211 return if $self->{parent};
146 212
147 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
148} 214}
149 215
150sub hide { 216sub hide {
151 my ($self) = @_; 217 my ($self) = @_;
152 218
153 return unless $self->{parent}; 219 undef $GRAB if $GRAB == $self;
220 undef $HOVER if $HOVER == $self;
154 221
155 $self->{parent}->remove ($self); 222 $self->{parent}->remove ($self)
223 if $self->{parent};
156} 224}
157 225
158sub move { 226sub move {
159 my ($self, $x, $y, $z) = @_; 227 my ($self, $x, $y, $z) = @_;
160 228
… …
163 $self->{z} = $z if defined $z; 231 $self->{z} = $z if defined $z;
164 232
165 $self->update; 233 $self->update;
166} 234}
167 235
168sub needs_redraw { 236sub set_size {
169 0 237 my ($self, $w, $h) = @_;
238
239 $self->{user_w} = $w;
240 $self->{user_h} = $h;
241
242 $self->check_size;
170} 243}
171 244
172sub size_request { 245sub size_request {
173 require Carp; 246 require Carp;
174 Carp::confess "size_request is abstract"; 247 Carp::confess "size_request is abstract";
… …
194 $self->{y} = $y; 267 $self->{y} = $y;
195 $self->update; 268 $self->update;
196 } 269 }
197 270
198 if ($self->{w} != $w || $self->{h} != $h) { 271 if ($self->{w} != $w || $self->{h} != $h) {
199 $self->{w} = $w; 272 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
200 $self->{h} = $h;
201
202 $self->size_allocate ($w, $h);
203 $self->update;
204 } 273 }
205} 274}
206 275
207sub size_allocate { 276sub size_allocate {
208 # nothing to be done 277 # nothing to be done
209} 278}
210 279
211# return top left coordinates 280sub reconfigure {
212sub _topleft { 281 my ($self) = @_;
282
283 $self->check_size (1);
284 $self->update;
285}
286
287sub children {
288}
289
290sub set_max_size {
213 my ($self, $x, $y) = @_; 291 my ($self, $w, $h) = @_;
214 292
215 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 293 delete $self->{max_w}; $self->{max_w} = $w if $w;
294 delete $self->{max_h}; $self->{max_h} = $h if $h;
295}
296
297sub set_tooltip {
298 my ($self, $tooltip) = @_;
299
300 $self->{tooltip} = $tooltip;
301
302 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303 delete $CFClient::UI::TOOLTIP->{owner};
304 CFClient::UI::check_tooltip;
305 }
216} 306}
217 307
218# translate global coordinates to local coordinate system 308# translate global coordinates to local coordinate system
219sub coord2local { 309sub coord2local {
220 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
221 311
222 my ($X, $Y) = $self->_topleft; 312 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
223 ($x - $X, $y - $Y)
224} 313}
225 314
226# translate local coordinates to global coordinate system 315# translate local coordinates to global coordinate system
227sub coord2global { 316sub coord2global {
228 my ($self, $x, $y) = @_; 317 my ($self, $x, $y) = @_;
229 318
230 my ($X, $Y) = $self->_topleft; 319 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
231 ($x + $X, $y + $Y)
232} 320}
233 321
234sub focus_in { 322sub focus_in {
235 my ($self) = @_; 323 my ($self) = @_;
236 324
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 384 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 385 glVertex $x , $y + $self->{h};
298 glEnd; 386 glEnd;
299 glDisable GL_BLEND; 387 glDisable GL_BLEND;
300 } 388 }
389
390 if ($ENV{PCLIENT_DEBUG}) {
391 glPushMatrix;
392 glColor 1, 1, 0, 1;
393 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
394 glBegin GL_LINE_LOOP;
395 glVertex 0 , 0;
396 glVertex $self->{w}, 0;
397 glVertex $self->{w}, $self->{h};
398 glVertex 0 , $self->{h};
399 glEnd;
400 glPopMatrix;
401 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
402 }
301} 403}
302 404
303sub _draw { 405sub _draw {
304 my ($self) = @_; 406 my ($self) = @_;
305 407
… …
320 422
321sub set_parent { 423sub set_parent {
322 my ($self, $parent) = @_; 424 my ($self, $parent) = @_;
323 425
324 Scalar::Util::weaken ($self->{parent} = $parent); 426 Scalar::Util::weaken ($self->{parent} = $parent);
427
428 # TODO: req_w _does_change after ->reconfigure
429 $self->check_size
430 unless exists $self->{req_w};
431
432 $self->show;
325} 433}
326 434
327sub check_size { 435sub check_size {
328 my ($self) = @_; 436 my ($self, $forced) = @_;
329 437
330 return unless $self->{parent}; 438 $self->{force_alloc} = 1 if $forced;
331 439 $CFClient::UI::ROOT->{check_size}{$self} = $self;
332 my ($w, $h) = $self->size_request;
333
334 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w;
336 $self->{req_h} = $h;
337
338 $self->{parent}->check_size;
339 }
340} 440}
341 441
342sub update { 442sub update {
343 my ($self) = @_; 443 my ($self) = @_;
344 444
… …
353} 453}
354 454
355sub emit { 455sub emit {
356 my ($self, $signal, @args) = @_; 456 my ($self, $signal, @args) = @_;
357 457
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 458 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
359 $cb->($self, @args);
360 }
361} 459}
362 460
363sub DESTROY { 461sub DESTROY {
364 my ($self) = @_; 462 my ($self) = @_;
365 463
464 delete $WIDGET{$self+0};
366 #$self->deactivate; 465 #$self->deactivate;
367} 466}
368 467
369############################################################################# 468#############################################################################
370 469
… …
379 my $class = shift; 478 my $class = shift;
380 479
381 # range [value, low, high, page] 480 # range [value, low, high, page]
382 481
383 $class->SUPER::new ( 482 $class->SUPER::new (
384 bg => [0, 0, 0, 0.2], 483 #bg => [0, 0, 0, 0.2],
385 active_bg => [1, 1, 1, 0.5], 484 #active_bg => [1, 1, 1, 0.5],
386 @_ 485 @_
387 ) 486 )
388} 487}
389 488
390sub _draw { 489sub _draw {
391 my ($self) = @_; 490 my ($self) = @_;
392 491
492 my $color = $FOCUS == $self && $self->{active_bg}
493 ? $self->{active_bg}
494 : $self->{bg};
495
496 if ($color && (@$color < 4 || $color->[3])) {
393 my ($w, $h) = @$self{qw(w h)}; 497 my ($w, $h) = @$self{qw(w h)};
394 498
395 glEnable GL_BLEND; 499 glEnable GL_BLEND;
396 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 500 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
397 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 501 glColor @$color;
398 502
399 glBegin GL_QUADS; 503 glBegin GL_QUADS;
400 glVertex 0 , 0; 504 glVertex 0 , 0;
401 glVertex 0 , $h; 505 glVertex 0 , $h;
402 glVertex $w, $h; 506 glVertex $w, $h;
403 glVertex $w, 0; 507 glVertex $w, 0;
404 glEnd; 508 glEnd;
405 509
406 glDisable GL_BLEND; 510 glDisable GL_BLEND;
511 }
407} 512}
408 513
409############################################################################# 514#############################################################################
410 515
411package CFClient::UI::Empty; 516package CFClient::UI::Empty;
… …
432sub new { 537sub new {
433 my ($class, %arg) = @_; 538 my ($class, %arg) = @_;
434 539
435 my $children = delete $arg{children} || []; 540 my $children = delete $arg{children} || [];
436 541
437 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 542 my $self = $class->SUPER::new (
543 children => [],
544 can_events => 0,
545 %arg,
546 );
438 $self->add ($_) for @$children; 547 $self->add ($_) for @$children;
439 548
440 $self 549 $self
441} 550}
442 551
443sub add { 552sub add {
444 my ($self, $child) = @_; 553 my ($self, @widgets) = @_;
445 554
446 $child->set_parent ($self); 555 $_->set_parent ($self)
556 for @widgets;
447 557
448 use sort 'stable'; 558 use sort 'stable';
449 559
450 $self->{children} = [ 560 $self->{children} = [
451 sort { $a->{z} <=> $b->{z} } 561 sort { $a->{z} <=> $b->{z} }
452 @{$self->{children}}, $child 562 @{$self->{children}}, @widgets
453 ]; 563 ];
454 564
455 $child->check_size; 565 $self->check_size (1);
566 $self->update;
567}
568
569sub children {
570 @{ $_[0]{children} }
456} 571}
457 572
458sub remove { 573sub remove {
459 my ($self, $child) = @_; 574 my ($self, $child) = @_;
460 575
461 delete $child->{parent}; 576 delete $child->{parent};
577 $child->hide;
462 578
463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 579 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
580
581 $self->check_size;
582 $self->update;
583}
584
585sub clear {
586 my ($self) = @_;
587
588 my $children = delete $self->{children};
589 $self->{children} = [];
590
591 for (@$children) {
592 delete $_->{parent};
593 $_->hide;
594 }
464 595
465 $self->check_size; 596 $self->check_size;
466 $self->update; 597 $self->update;
467} 598}
468 599
… …
546} 677}
547 678
548sub update { 679sub update {
549 my ($self) = @_; 680 my ($self) = @_;
550 681
551 # we want to do this delayed... 682 $ROOT->on_post_alloc ($self => sub { $self->render_child });
552 $self->render_chld;
553 $self->SUPER::update; 683 $self->SUPER::update;
554}
555
556sub render_chld {
557 my ($self) = @_;
558
559 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
560 glClearColor 0, 0, 0, 1;
561 glClear GL_COLOR_BUFFER_BIT;
562 $self->child->draw;
563 };
564} 684}
565 685
566sub size_allocate { 686sub size_allocate {
567 my ($self, $w, $h) = @_; 687 my ($self, $w, $h) = @_;
568 688
569 $self->child->configure (0, 0, $w, $h); 689 $self->SUPER::size_allocate ($w, $h);
690 $self->update;
691}
570 692
693sub _render {
694 $_[0]{children}[0]->draw;
695}
696
697sub render_child {
698 my ($self) = @_;
699
700 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
701 glClearColor 0, 0, 0, 0;
702 glClear GL_COLOR_BUFFER_BIT;
703
571 $self->render_chld; 704 $self->_render;
705 };
572} 706}
573 707
574sub _draw { 708sub _draw {
575 my ($self) = @_; 709 my ($self) = @_;
576 710
577 my ($w, $h) = ($self->w, $self->h); 711 my ($w, $h) = ($self->w, $self->h);
578 712
579 my $tex = $self->{texture} 713 my $tex = $self->{texture}
580 or return; 714 or return;
581 715
582 glEnable GL_BLEND;
583 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
584 glEnable GL_TEXTURE_2D; 716 glEnable GL_TEXTURE_2D;
585 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
718 glColor 1, 1, 1, 1;
586 719
587 $tex->draw_quad (0, 0, $w, $h); 720 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
588 721
589 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 722 glDisable GL_TEXTURE_2D;
591} 723}
592 724
593############################################################################# 725#############################################################################
594 726
595package CFClient::UI::ViewPort; 727package CFClient::UI::ViewPort;
596 728
597our @ISA = CFClient::UI::Window::; 729our @ISA = CFClient::UI::Window::;
598 730
599sub new { die }
600
601sub size_request { 731sub size_request {
602 my ($self) = @_; 732 my ($self) = @_;
603 733
604 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 734 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 735 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
606 736
607 @$self{qw(child_w child_h)} 737 @$self{qw(child_w child_h)}
608} 738}
609 739
610sub _draw { 740sub size_allocate {
611 my ($self) = @_; 741 my ($self, $w, $h) = @_;
612 742
613 $self->{children}[1]->draw; 743 $self->update;
614} 744}
615 745
746sub set_offset {
747 my ($self, $x, $y) = @_;
748
749 $self->{view_x} = int $x;
750 $self->{view_y} = int $y;
751
752 $self->update;
753}
754
755# hmm, this does not work for topleft of $self... but we should not ask for that
756sub coord2local {
757 my ($self, $x, $y) = @_;
758
759 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
760}
761
762sub coord2global {
763 my ($self, $x, $y) = @_;
764
765 $x = List::Util::min $self->{w}, $x - $self->{view_x};
766 $y = List::Util::min $self->{h}, $y - $self->{view_y};
767
768 $self->SUPER::coord2global ($x, $y)
769}
770
771sub find_widget {
772 my ($self, $x, $y) = @_;
773
774 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
775 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
776 ) {
777 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
778 } else {
779 $self->CFClient::UI::Base::find_widget ($x, $y)
780 }
781}
782
783sub _render {
784 my ($self) = @_;
785
786 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
787
788 $self->SUPER::_render;
789}
616 790
617############################################################################# 791#############################################################################
618 792
619package CFClient::UI::Frame; 793package CFClient::UI::ScrolledWindow;
620 794
621our @ISA = CFClient::UI::Bin::; 795our @ISA = CFClient::UI::HBox::;
622
623use CFClient::OpenGL;
624 796
625sub new { 797sub new {
626 my $class = shift; 798 my $class = shift;
627 799
800 my $self;
801
802 my $slider = new CFClient::UI::Slider
803 vertical => 1,
804 range => [0, 0, 1, 0.01], # HACK fix
805 connect_changed => sub {
806 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
807 },
808 ;
809
628 my $self = $class->SUPER::new ( 810 $self = $class->SUPER::new (
629 bg => [1, 1, 1, 1], 811 vp => (new CFClient::UI::ViewPort expand => 1),
630 border_bg => [1, 1, 1, 1], 812 slider => $slider,
631 border => 0.8,
632 @_ 813 @_,
633 ); 814 );
634 815
816 $self->{vp}->add ($self->{scrolled});
817 $self->add ($self->{vp});
818 $self->add ($self->{slider});
819
635 $self 820 $self
636} 821}
637 822
638sub set_size { 823#TODO# update range on size_allocate depending on child
639 my ($self, $w, $h) = @_; 824# update viewport offset on scroll
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643}
644 825
645sub size_request { 826#############################################################################
646 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h})
648}
649 827
650sub size_allocate { 828package CFClient::UI::Frame;
651 my ($self, $w, $h) = @_; 829
652 $self->{w} = $w; 830our @ISA = CFClient::UI::Bin::;
653 $self->{h} = $h; 831
654 $self->child->configure (0, 0, $w, $h); 832use CFClient::OpenGL;
833
834sub new {
835 my $class = shift;
836
837 $class->SUPER::new (
838 bg => undef,
839 @_,
840 )
655} 841}
656 842
657sub _draw { 843sub _draw {
658 my ($self) = @_; 844 my ($self) = @_;
659 845
660 my ($w, $h) = ($self->{w}, $self->{h}); 846 if ($self->{bg}) {
847 my ($w, $h) = @$self{qw(w h)};
661 848
662 glEnable GL_BLEND; 849 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 850 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 851 glColor @{ $self->{bg} };
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
666 852
667# glBegin GL_QUADS; 853 glBegin GL_QUADS;
668# glColor 0, 0, 0, 0;
669# glVertex 0 , 0; 854 glVertex 0 , 0;
670# glVertex 0 , $h; 855 glVertex 0 , $h;
671# glVertex $w, $h; 856 glVertex $w, $h;
672# glVertex $w, 0; 857 glVertex $w, 0;
673# glEnd; 858 glEnd;
674 859
675
676 $self->child->draw;
677 glDisable GL_BLEND; 860 glDisable GL_BLEND;
678 glDisable GL_TEXTURE_2D; 861 }
862
863 $self->SUPER::_draw;
679} 864}
680 865
681############################################################################# 866#############################################################################
682 867
683package CFClient::UI::FancyFrame; 868package CFClient::UI::FancyFrame;
… …
694 my $class = shift; 879 my $class = shift;
695 880
696 # TODO: user_x, user_y, overwrite moveto? 881 # TODO: user_x, user_y, overwrite moveto?
697 882
698 my $self = $class->SUPER::new ( 883 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 884 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 885 border_bg => [1, 1, 1, 1],
701 border => 0.8, 886 border => 0.6,
887 toplevel => 1,
702 can_events => 1, 888 can_events => 1,
703 @_ 889 @_
704 ); 890 );
705 891
706 $self->{title} &&= new CFClient::UI::Label 892 $self->{title} &&= new CFClient::UI::Label
707 align => 0, 893 align => 0,
708 valign => 1, 894 valign => 1,
709 text => $self->{title}, 895 text => $self->{title},
710 fontsize => 1; 896 fontsize => $self->{border};
711 897
712 $self 898 $self
713} 899}
714 900
715sub border { 901sub border {
716 int $_[0]{border} * $::FONTSIZE 902 int $_[0]{border} * $::FONTSIZE
717} 903}
718 904
719sub size_request { 905sub size_request {
720 my ($self) = @_; 906 my ($self) = @_;
721
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723 907
724 my ($w, $h) = $self->SUPER::size_request; 908 my ($w, $h) = $self->SUPER::size_request;
725 909
726 ( 910 (
727 $w + $self->border * 2, 911 $w + $self->border * 2,
… …
733 my ($self, $w, $h) = @_; 917 my ($self, $w, $h) = @_;
734 918
735 $h -= List::Util::max 0, $self->border * 2; 919 $h -= List::Util::max 0, $self->border * 2;
736 $w -= List::Util::max 0, $self->border * 2; 920 $w -= List::Util::max 0, $self->border * 2;
737 921
738 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 922 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
739 if $self->{title}; 923 if $self->{title};
740 924
741 $self->child->configure ($self->border, $self->border, $w, $h); 925 $self->child->configure ($self->border, $self->border, $w, $h);
742} 926}
743 927
744sub button_down { 928sub button_down {
745 my ($self, $ev, $x, $y) = @_; 929 my ($self, $ev, $x, $y) = @_;
746 930
931 my ($w, $h) = @$self{qw(w h)};
747 my $border = $self->border; 932 my $border = $self->border;
748 933
749 if ($x < $self->{w} && $x >= $self->{w} - $border 934 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
750 && $y < $self->{h} && $y >= $self->{h} - $border) { 935 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
751 936
937 if ($lr & $td) {
938 my ($wx, $wy) = ($self->{x}, $self->{y});
752 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 939 my ($ox, $oy) = ($ev->{x}, $ev->{y});
753 my ($bw, $bh) = ($self->{w}, $self->{h}); 940 my ($bw, $bh) = ($self->{w}, $self->{h});
754 941
942 my $mx = $x < $border;
943 my $my = $y < $border;
944
755 $self->{motion} = sub { 945 $self->{motion} = sub {
756 my ($ev, $x, $y) = @_; 946 my ($ev, $x, $y) = @_;
757 947
758 ($x, $y) = ($ev->{x}, $ev->{y}); 948 my $dx = $ev->{x} - $ox;
949 my $dy = $ev->{y} - $oy;
759 950
760 $self->{user_w} = $bw + $x - $ox; 951 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
761 $self->{user_h} = $bh + $y - $oy; 952 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
953 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
762 $self->check_size; 954 $self->check_size;
763 }; 955 };
764 956
765 } elsif ($x >= 0 && $x < $self->{w} 957 } elsif ($lr ^ $td) {
766 && $y >= 0 && $y < $border) {
767
768 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 958 my ($ox, $oy) = ($ev->{x}, $ev->{y});
769 my ($bx, $by) = ($self->{x}, $self->{y}); 959 my ($bx, $by) = ($self->{x}, $self->{y});
770 960
771 $self->{motion} = sub { 961 $self->{motion} = sub {
772 my ($ev, $x, $y) = @_; 962 my ($ev, $x, $y) = @_;
… …
795 my ($self) = @_; 985 my ($self) = @_;
796 986
797 my ($w, $h ) = ($self->{w}, $self->{h}); 987 my ($w, $h ) = ($self->{w}, $self->{h});
798 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 988 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
799 989
800 glEnable GL_BLEND;
801 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
802 glEnable GL_TEXTURE_2D; 990 glEnable GL_TEXTURE_2D;
803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
804 992
805 my $border = $self->border; 993 my $border = $self->border;
806 994
807 glColor @{ $self->{border_bg} }; 995 glColor @{ $self->{border_bg} };
808 $tex[1]->draw_quad (0, 0, $w, $border); 996 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
809 $tex[3]->draw_quad (0, $border, $border, $ch); 997 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 998 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
811 $tex[4]->draw_quad (0, $h - $border, $w, $border); 999 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
812 1000
1001 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
813 my $bg = $tex[0]; 1002 my $bg = $tex[0];
814 1003
815 # TODO: repeat texture not scale 1004 # TODO: repeat texture not scale
816 my $rep_x = $cw / $bg->{w}; 1005 my $rep_x = $cw / $bg->{w};
817 my $rep_y = $ch / $bg->{h}; 1006 my $rep_y = $ch / $bg->{h};
818 1007
819 glColor @{ $self->{bg} }; 1008 glColor @{ $self->{bg} };
820 1009
821 $bg->{s} = $rep_x; 1010 $bg->{s} = $rep_x;
822 $bg->{t} = $rep_y; 1011 $bg->{t} = $rep_y;
823 $bg->{wrap_mode} = 1; 1012 $bg->{wrap_mode} = 1;
824 $bg->draw_quad ($border, $border, $cw, $ch); 1013 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1014 }
825 1015
826 glDisable GL_TEXTURE_2D; 1016 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND;
828 1017
829 $self->{title}->draw if $self->{title}; 1018 $self->{title}->draw if $self->{title};
1019
830 $self->child->draw; 1020 $self->child->draw;
831} 1021}
832 1022
833############################################################################# 1023#############################################################################
834 1024
… …
856 $self->{children}[$y][$x] = $child; 1046 $self->{children}[$y][$x] = $child;
857 1047
858 $child->check_size; 1048 $child->check_size;
859} 1049}
860 1050
1051sub children {
1052 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053}
1054
861# TODO: move to container class maybe? send childs a signal on removal? 1055# TODO: move to container class maybe? send childs a signal on removal?
862sub clear { 1056sub clear {
863 my ($self) = @_; 1057 my ($self) = @_;
864 1058
1059 my @children = $self->children;
865 delete $self->{children}; 1060 delete $self->{children};
1061
1062 for (@children) {
1063 delete $_->{parent};
1064 $_->hide;
1065 }
1066
866 $self->update; 1067 $self->update;
867} 1068}
868 1069
869sub get_wh { 1070sub get_wh {
870 my ($self) = @_; 1071 my ($self) = @_;
… …
1047} 1248}
1048 1249
1049sub size_allocate { 1250sub size_allocate {
1050 my ($self, $w, $h) = @_; 1251 my ($self, $w, $h) = @_;
1051 1252
1253 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1254
1052 my $children = $self->{children}; 1255 my $children = $self->{children};
1053 1256
1054 my @h = map $_->{req_h}, @$children; 1257 my @h = map $_->{req_h}, @$children;
1055 1258
1056 my $req_h = List::Util::sum @h; 1259 my $req_h = List::Util::sum @h;
… …
1085 1288
1086############################################################################# 1289#############################################################################
1087 1290
1088package CFClient::UI::Label; 1291package CFClient::UI::Label;
1089 1292
1090our @ISA = CFClient::UI::Base::; 1293our @ISA = CFClient::UI::DrawBG::;
1091 1294
1092use CFClient::OpenGL; 1295use CFClient::OpenGL;
1093 1296
1094sub new { 1297sub new {
1095 my ($class, %arg) = @_; 1298 my ($class, %arg) = @_;
1096 1299
1097 my $self = $class->SUPER::new ( 1300 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1302 #bg => none
1303 #active_bg => none
1304 #font => default_font
1305 #text => initial text
1306 #markup => initial narkup
1307 #max_w => maximum pixel width
1308 ellipsise => 3, # end
1309 layout => (new CFClient::Layout),
1099 fontsize => 1, 1310 fontsize => 1,
1100 text => "",
1101 align => -1, 1311 align => -1,
1102 valign => -1, 1312 valign => -1,
1103 padding => 2, 1313 padding => 2,
1104 layout => new CFClient::Layout,
1105 can_events => 0, 1314 can_events => 0,
1106 %arg 1315 %arg
1107 ); 1316 );
1108 1317
1109 if (exists $self->{template}) { 1318 if (exists $self->{template}) {
1110 my $layout = new CFClient::Layout; 1319 my $layout = new CFClient::Layout;
1111 $layout->set_text (delete $self->{template}); 1320 $layout->set_text (delete $self->{template});
1112 $self->{template} = $layout; 1321 $self->{template} = $layout;
1113 } 1322 }
1114 1323
1115 $self->set_text (delete $self->{text}) if exists $self->{text}; 1324 if (exists $self->{markup}) {
1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1325 $self->set_markup (delete $self->{markup});
1326 } else {
1327 $self->set_text (delete $self->{text});
1328 }
1117 1329
1118 $self 1330 $self
1119} 1331}
1120 1332
1121sub escape_text { 1333sub escape($) {
1122 local $_ = $_[1]; 1334 local $_ = $_[0];
1123 1335
1124 s/&/&amp;/g; 1336 s/&/&amp;/g;
1125 s/>/&gt;/g; 1337 s/>/&gt;/g;
1126 s/</&lt;/g; 1338 s/</&lt;/g;
1127 1339
1128 $_[1] 1340 $_
1341}
1342
1343sub update {
1344 my ($self) = @_;
1345
1346 delete $self->{texture};
1347 $self->SUPER::update;
1129} 1348}
1130 1349
1131sub set_text { 1350sub set_text {
1132 my ($self, $text) = @_; 1351 my ($self, $text) = @_;
1133 1352
1353 return if $self->{text} eq "T$text";
1354 $self->{text} = "T$text";
1355
1356 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1134 $self->{layout}->set_text ($text); 1357 $self->{layout}->set_text ($text);
1135 1358
1136 delete $self->{texture}; 1359 $self->update;
1137 $self->check_size; 1360 $self->check_size;
1138 $self->update;
1139} 1361}
1140 1362
1141sub set_markup { 1363sub set_markup {
1142 my ($self, $markup) = @_; 1364 my ($self, $markup) = @_;
1143 1365
1366 return if $self->{text} eq "M$markup";
1367 $self->{text} = "M$markup";
1368
1369 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1370
1371 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1144 $self->{layout}->set_markup ($markup); 1372 $self->{layout}->set_markup ($markup);
1145 1373
1146 delete $self->{texture}; 1374 $self->update;
1147 $self->check_size; 1375 $self->check_size;
1148 $self->update;
1149} 1376}
1150 1377
1151sub size_request { 1378sub size_request {
1152 my ($self) = @_; 1379 my ($self) = @_;
1153 1380
1154 $self->{layout}->set_width; 1381 $self->{layout}->set_font ($self->{font}) if $self->{font};
1382 $self->{layout}->set_width ($self->{max_w} || -1);
1383 $self->{layout}->set_ellipsise ($self->{ellipsise});
1384 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1386
1157 my ($w, $h) = $self->{layout}->size; 1387 my ($w, $h) = $self->{layout}->size;
1158 1388
1159 if (exists $self->{template}) { 1389 if (exists $self->{template}) {
1390 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1391 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1392
1162 my ($w2, $h2) = $self->{template}->size; 1393 my ($w2, $h2) = $self->{template}->size;
1163 1394
1164 $w = List::Util::max $w, $w2; 1395 $w = List::Util::max $w, $w2;
… …
1180sub set_fontsize { 1411sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1412 my ($self, $fontsize) = @_;
1182 1413
1183 $self->{fontsize} = $fontsize; 1414 $self->{fontsize} = $fontsize;
1184 delete $self->{texture}; 1415 delete $self->{texture};
1416
1417 $self->update;
1185 $self->check_size; 1418 $self->check_size;
1186 $self->update;
1187} 1419}
1188 1420
1189sub _draw { 1421sub _draw {
1190 my ($self) = @_; 1422 my ($self) = @_;
1191 1423
1424 $self->SUPER::_draw; # draw background, if applicable
1425
1192 my $tex = $self->{texture} ||= do { 1426 my $tex = $self->{texture} ||= do {
1427 $self->{layout}->set_foreground (@{$self->{fg}});
1428 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $self->{layout}->set_width ($self->{w}); 1429 $self->{layout}->set_width ($self->{w});
1430 $self->{layout}->set_ellipsise ($self->{ellipsise});
1431 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1194 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1432 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1433
1195 new_from_layout CFClient::Texture $self->{layout} 1434 my $tex = new_from_layout CFClient::Texture $self->{layout};
1435
1436 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1437 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1438 : ($self->{w} - $tex->{w}) * 0.5);
1439
1440 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1441 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1442 : ($self->{h} - $tex->{h}) * 0.5);
1443
1444 $tex
1196 }; 1445 };
1197 1446
1198 glEnable GL_BLEND;
1199 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1200 glEnable GL_TEXTURE_2D; 1447 glEnable GL_TEXTURE_2D;
1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1448 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1202 1449
1450 if ($tex->{format} == GL_ALPHA) {
1203 glColor @{$self->{fg}}; 1451 glColor @{$self->{fg}};
1204
1205 $self->{ox} = int (
1206 $self->{align} < 0 ? $self->{padding}
1207 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1208 : ($self->{w} - $tex->{w}) * 0.5
1209 );
1210
1211 $self->{oy} = int (
1212 $self->{valign} < 0 ? $self->{padding}
1213 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1214 : ($self->{h} - $tex->{h}) * 0.5
1215 );
1216
1217 $tex->draw_quad ($self->{ox}, $self->{oy}); 1452 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1453 } else {
1454 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1455 }
1218 1456
1219 glDisable GL_TEXTURE_2D; 1457 glDisable GL_TEXTURE_2D;
1220 glDisable GL_BLEND;
1221} 1458}
1222 1459
1223############################################################################# 1460#############################################################################
1224 1461
1225package CFClient::UI::EntryBase; 1462package CFClient::UI::EntryBase;
… …
1230 1467
1231sub new { 1468sub new {
1232 my $class = shift; 1469 my $class = shift;
1233 1470
1234 $class->SUPER::new ( 1471 $class->SUPER::new (
1235 fg => [1, 1, 1], 1472 fg => [1, 1, 1],
1236 bg => [0, 0, 0, 0.2], 1473 bg => [0, 0, 0, 0.2],
1237 active_bg => [1, 1, 1, 0.5], 1474 active_bg => [1, 1, 1, 0.5],
1238 active_fg => [0, 0, 0], 1475 active_fg => [0, 0, 0],
1239 can_hover => 1, 1476 can_hover => 1,
1240 can_focus => 1, 1477 can_focus => 1,
1241 valign => 0, 1478 valign => 0,
1242 can_events => 1, 1479 can_events => 1,
1243 @_ 1480 @_
1244 ) 1481 )
1245} 1482}
1246 1483
… …
1260 $self->{layout}->set_text ("$text "); 1497 $self->{layout}->set_text ("$text ");
1261 1498
1262 $self->emit (changed => $self->{text}); 1499 $self->emit (changed => $self->{text});
1263} 1500}
1264 1501
1265sub get_text {
1266 $_[0]{text}
1267}
1268
1269sub size_request {
1270 my ($self) = @_;
1271
1272 my ($w, $h) = $self->SUPER::size_request;
1273
1274 ($w + 1, $h) # add 1 for cursor
1275}
1276
1277sub size_allocate {
1278 my ($self, $w, $h) = @_;
1279
1280 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1281}
1282
1283sub set_text { 1502sub set_text {
1284 my ($self, $text) = @_; 1503 my ($self, $text) = @_;
1285 1504
1286 $self->{cursor} = length $text; 1505 $self->{cursor} = length $text;
1287 $self->_set_text ($text); 1506 $self->_set_text ($text);
1288 $self->update; 1507 $self->update;
1508 $self->check_size;
1509}
1510
1511sub get_text {
1512 $_[0]{text}
1513}
1514
1515sub size_request {
1516 my ($self) = @_;
1517
1518 my ($w, $h) = $self->SUPER::size_request;
1519
1520 ($w + 1, $h) # add 1 for cursor
1521}
1522
1523sub size_allocate {
1524 my ($self, $w, $h) = @_;
1525
1526 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1289} 1527}
1290 1528
1291sub key_down { 1529sub key_down {
1292 my ($self, $ev) = @_; 1530 my ($self, $ev) = @_;
1293 1531
… …
1295 my $sym = $ev->{sym}; 1533 my $sym = $ev->{sym};
1296 my $uni = $ev->{unicode}; 1534 my $uni = $ev->{unicode};
1297 1535
1298 my $text = $self->get_text; 1536 my $text = $self->get_text;
1299 1537
1300 if ($sym == 8) { 1538 if ($uni == 8) {
1301 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1539 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1302 } elsif ($sym == 127) { 1540 } elsif ($uni == 127) {
1303 substr $text, $self->{cursor}, 1, ""; 1541 substr $text, $self->{cursor}, 1, "";
1304 } elsif ($sym == CFClient::SDLK_LEFT) { 1542 } elsif ($sym == CFClient::SDLK_LEFT) {
1305 --$self->{cursor} if $self->{cursor}; 1543 --$self->{cursor} if $self->{cursor};
1306 } elsif ($sym == CFClient::SDLK_RIGHT) { 1544 } elsif ($sym == CFClient::SDLK_RIGHT) {
1307 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1545 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1308 } elsif ($sym == CFClient::SDLK_HOME) { 1546 } elsif ($sym == CFClient::SDLK_HOME) {
1309 $self->{cursor} = 0; 1547 $self->{cursor} = 0;
1310 } elsif ($sym == CFClient::SDLK_END) { 1548 } elsif ($sym == CFClient::SDLK_END) {
1311 $self->{cursor} = length $text; 1549 $self->{cursor} = length $text;
1312 } elsif ($sym == 27) { 1550 } elsif ($uni == 27) {
1313 $self->emit ('escape'); 1551 $self->emit ('escape');
1314 } elsif ($uni) { 1552 } elsif ($uni) {
1315 substr $text, $self->{cursor}++, 0, chr $uni; 1553 substr $text, $self->{cursor}++, 0, chr $uni;
1316 } 1554 }
1317 1555
1318 $self->_set_text ($text); 1556 $self->_set_text ($text);
1319 $self->update; 1557 $self->update;
1558 $self->check_size;
1320} 1559}
1321 1560
1322sub focus_in { 1561sub focus_in {
1323 my ($self) = @_; 1562 my ($self) = @_;
1324 1563
… …
1400 my ($self, $ev) = @_; 1639 my ($self, $ev) = @_;
1401 1640
1402 my $sym = $ev->{sym}; 1641 my $sym = $ev->{sym};
1403 1642
1404 if ($sym == 13) { 1643 if ($sym == 13) {
1644 unshift @{$self->{history}},
1645 my $txt = $self->get_text;
1646 $self->{history_pointer} = -1;
1647 $self->{history_saveback} = '';
1405 $self->emit (activate => $self->get_text); 1648 $self->emit (activate => $txt);
1406 $self->update; 1649 $self->update;
1650
1651 } elsif ($sym == CFClient::SDLK_UP) {
1652 if ($self->{history_pointer} < 0) {
1653 $self->{history_saveback} = $self->get_text;
1654 }
1655 if (@{$self->{history} || []} > 0) {
1656 $self->{history_pointer}++;
1657 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1658 $self->{history_pointer} = @{$self->{history} || []} - 1;
1659 }
1660 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1661 }
1662
1663 } elsif ($sym == CFClient::SDLK_DOWN) {
1664 $self->{history_pointer}--;
1665 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1666
1667 if ($self->{history_pointer} >= 0) {
1668 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1669 } else {
1670 $self->set_text ($self->{history_saveback});
1671 }
1407 1672
1408 } else { 1673 } else {
1409 $self->SUPER::key_down ($ev); 1674 $self->SUPER::key_down ($ev);
1410 } 1675 }
1411 1676
… …
1425 1690
1426sub new { 1691sub new {
1427 my $class = shift; 1692 my $class = shift;
1428 1693
1429 $class->SUPER::new ( 1694 $class->SUPER::new (
1430 padding => 4, 1695 padding => 4,
1431 fg => [1, 1, 1], 1696 fg => [1, 1, 1],
1432 bg => [1, 1, 1, 0.2],
1433 active_fg => [0, 0, 1], 1697 active_fg => [0, 0, 1],
1434 can_hover => 1, 1698 can_hover => 1,
1435 align => 0, 1699 align => 0,
1436 valign => 0, 1700 valign => 0,
1437 can_events => 1, 1701 can_events => 1,
1438 @_ 1702 @_
1439 ) 1703 )
1440} 1704}
1441 1705
… …
1455 1719
1456 if ($GRAB == $self) { 1720 if ($GRAB == $self) {
1457 $self->{fg} = $self->{active_fg}; 1721 $self->{fg} = $self->{active_fg};
1458 } 1722 }
1459 1723
1460 glEnable GL_BLEND;
1461 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1462 glEnable GL_TEXTURE_2D; 1724 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1725 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 glColor 0, 0, 0, 1; 1726 glColor 0, 0, 0, 1;
1465 1727
1466 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1728 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1467 1729
1468 glDisable GL_TEXTURE_2D; 1730 glDisable GL_TEXTURE_2D;
1469 glDisable GL_BLEND;
1470 1731
1471 $self->SUPER::_draw; 1732 $self->SUPER::_draw;
1472} 1733}
1473 1734
1474############################################################################# 1735#############################################################################
… …
1488 1749
1489 $class->SUPER::new ( 1750 $class->SUPER::new (
1490 padding => 2, 1751 padding => 2,
1491 fg => [1, 1, 1], 1752 fg => [1, 1, 1],
1492 active_fg => [1, 1, 0], 1753 active_fg => [1, 1, 0],
1754 bg => [0, 0, 0, 0.2],
1755 active_bg => [1, 1, 1, 0.5],
1493 state => 0, 1756 state => 0,
1494 can_hover => 1, 1757 can_hover => 1,
1495 @_ 1758 @_
1496 ) 1759 )
1497} 1760}
… …
1521 1784
1522 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1785 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1523 1786
1524 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1787 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1525 1788
1526 glEnable GL_BLEND; 1789 my $tex = $self->{state} ? $tex[1] : $tex[0];
1790
1527 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1529
1530 my $tex = $self->{state} ? $tex[1] : $tex[0];
1531
1532 $tex->draw_quad (0, 0, $s, $s); 1792 $tex->draw_quad_alpha (0, 0, $s, $s);
1533
1534 glDisable GL_TEXTURE_2D; 1793 glDisable GL_TEXTURE_2D;
1535 glDisable GL_BLEND;
1536} 1794}
1537 1795
1538############################################################################# 1796#############################################################################
1539 1797
1540package CFClient::UI::Image; 1798package CFClient::UI::Image;
… …
1583 glTranslate 0, -$self->{w}, 0; 1841 glTranslate 0, -$self->{w}, 0;
1584 1842
1585 ($w, $h) = ($h, $w); 1843 ($w, $h) = ($h, $w);
1586 } 1844 }
1587 1845
1588 glEnable GL_BLEND;
1589 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590 glEnable GL_TEXTURE_2D; 1846 glEnable GL_TEXTURE_2D;
1591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1592 1848
1593 $tex->draw_quad (0, 0, $w, $h); 1849 $tex->draw_quad_alpha (0, 0, $w, $h);
1594 1850
1595 glDisable GL_BLEND;
1596 glDisable GL_TEXTURE_2D; 1851 glDisable GL_TEXTURE_2D;
1597} 1852}
1598 1853
1599############################################################################# 1854#############################################################################
1600 1855
1601package CFClient::UI::VGauge; 1856package CFClient::UI::VGauge;
1602 1857
1603our @ISA = CFClient::UI::Base::; 1858our @ISA = CFClient::UI::Base::;
1859
1860use List::Util qw(min max);
1604 1861
1605use CFClient::OpenGL; 1862use CFClient::OpenGL;
1606 1863
1607my %tex = ( 1864my %tex = (
1608 food => [ 1865 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1867 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ], 1868 ],
1612 grace => [ 1869 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1870 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1871 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1615 ], 1872 ],
1616 hp => [ 1873 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1874 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1875 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ], 1876 ],
1620 mana => [ 1877 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1878 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1879 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1623 ], 1880 ],
1624); 1881);
1625 1882
1626# eg. VGauge->new (gauge => 'food'), default gauge: food 1883# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new { 1884sub new {
… …
1646} 1903}
1647 1904
1648sub set_max { 1905sub set_max {
1649 my ($self, $max) = @_; 1906 my ($self, $max) = @_;
1650 1907
1908 return if $self->{max_val} == $max;
1909
1651 $self->{max_val} = $max; 1910 $self->{max_val} = $max;
1911 $self->update;
1652} 1912}
1653 1913
1654sub set_value { 1914sub set_value {
1655 my ($self, $val, $max) = @_; 1915 my ($self, $val, $max) = @_;
1656 1916
1657 $self->set_max ($max) 1917 $self->set_max ($max)
1658 if defined $max; 1918 if defined $max;
1659 1919
1660 $max = $self->{max_val}; 1920 return if $self->{val} == $val;
1921
1661 $self->{val} = $val; 1922 $self->{val} = $val;
1662
1663 $self->update; 1923 $self->update;
1664} 1924}
1665 1925
1666sub _draw { 1926sub _draw {
1667 my ($self) = @_; 1927 my ($self) = @_;
1668 1928
1669 my $tex = $tex{$self->{type}}; 1929 my $tex = $tex{$self->{type}};
1930 my ($t1, $t2, $t3) = @$tex;
1670 1931
1671 my ($w, $h) = ($self->{w}, $self->{h}); 1932 my ($w, $h) = ($self->{w}, $self->{h});
1672 1933
1673 if ($self->{vertical}) { 1934 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1; 1935 glRotate 90, 0, 0, 1;
… …
1676 1937
1677 ($w, $h) = ($h, $w); 1938 ($w, $h) = ($h, $w);
1678 } 1939 }
1679 1940
1680 my $ycut = $self->{val} / ($self->{max_val} || 1); 1941 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682 1942
1683 my $t1 = $tex->[0]; 1943 my $ycut1 = max 0, min 1, $ycut;
1684 my $t2 = $tex->[1]; 1944 my $ycut2 = max 0, min 1, $ycut - 1;
1945
1946 my $h1 = $self->{h} * (1 - $ycut1);
1947 my $h2 = $self->{h} * (1 - $ycut2);
1685 1948
1686 glEnable GL_BLEND; 1949 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1950 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D; 1951 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1952 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690 1953
1691 my $h1 = $self->{h} - $ycut * $self->{h};
1692 my $h2 = $ycut * $self->{h};
1693
1694 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1954 glBindTexture GL_TEXTURE_2D, $t1->{name};
1695 glBegin GL_QUADS; 1955 glBegin GL_QUADS;
1696 glTexCoord 0 , 0; glVertex 0 , 0; 1956 glTexCoord 0 , 0; glVertex 0 , 0;
1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1957 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1958 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1699 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1959 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1700 glEnd; 1960 glEnd;
1701 1961
1962 my $ycut1 = List::Util::min 1, $ycut;
1702 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1963 glBindTexture GL_TEXTURE_2D, $t2->{name};
1703 glBegin GL_QUADS; 1964 glBegin GL_QUADS;
1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1965 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1966 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1967 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1968 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1708 glEnd; 1969 glEnd;
1970
1971 if ($t3) {
1972 glBindTexture GL_TEXTURE_2D, $t3->{name};
1973 glBegin GL_QUADS;
1974 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1975 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1976 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1977 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1978 glEnd;
1979 }
1709 1980
1710 glDisable GL_BLEND; 1981 glDisable GL_BLEND;
1711 glDisable GL_TEXTURE_2D; 1982 glDisable GL_TEXTURE_2D;
1712} 1983}
1713 1984
… …
1719 1990
1720sub new { 1991sub new {
1721 my ($class, %arg) = @_; 1992 my ($class, %arg) = @_;
1722 1993
1723 my $self = $class->SUPER::new ( 1994 my $self = $class->SUPER::new (
1724 tooltip => $arg{type}, 1995 tooltip => $arg{type},
1996 can_hover => 1,
1997 can_events => 1,
1725 %arg, 1998 %arg,
1726 ); 1999 );
1727 2000
1728 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2001 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1729 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2002 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1730 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2003 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1731 2004
1732 $self 2005 $self
1733} 2006}
1734 2007
… …
1737 2010
1738 $self->{value}->set_fontsize ($fsize); 2011 $self->{value}->set_fontsize ($fsize);
1739 $self->{max} ->set_fontsize ($fsize); 2012 $self->{max} ->set_fontsize ($fsize);
1740} 2013}
1741 2014
2015sub set_max {
2016 my ($self, $max) = @_;
2017
2018 $self->{gauge}->set_max ($max);
2019 $self->{max}->set_text ($max);
2020}
2021
1742sub set_value { 2022sub set_value {
1743 my ($self, $val, $max) = @_; 2023 my ($self, $val, $max) = @_;
1744 2024
1745 $self->set_max ($max) 2025 $self->set_max ($max)
1746 if defined $max; 2026 if defined $max;
1747 2027
1748 $self->{gauge}->set_value ($val, $max); 2028 $self->{gauge}->set_value ($val, $max);
1749 $self->{value}->set_text ($val); 2029 $self->{value}->set_text ($val);
1750}
1751
1752sub set_max {
1753 my ($self, $max) = @_;
1754
1755 $self->{gauge}->set_max ($max);
1756 $self->{max}->set_text ($max);
1757} 2030}
1758 2031
1759############################################################################# 2032#############################################################################
1760 2033
1761package CFClient::UI::Slider; 2034package CFClient::UI::Slider;
… …
1771 qw(s1_slider.png s1_slider_bg.png); 2044 qw(s1_slider.png s1_slider_bg.png);
1772 2045
1773sub new { 2046sub new {
1774 my $class = shift; 2047 my $class = shift;
1775 2048
1776 # range [value, low, high, page] 2049 # range [value, low, high, page, unit]
1777 2050
1778 # TODO: 0-width page 2051 # TODO: 0-width page
1779 # TODO: req_w/h are wrong with vertical 2052 # TODO: req_w/h are wrong with vertical
1780 # TODO: calculations are off 2053 # TODO: calculations are off
1781 my $self = $class->SUPER::new ( 2054 my $self = $class->SUPER::new (
1782 fg => [1, 1, 1], 2055 fg => [1, 1, 1],
1783 active_fg => [0, 0, 0], 2056 active_fg => [0, 0, 0],
2057 bg => [0, 0, 0, 0.2],
2058 active_bg => [1, 1, 1, 0.5],
1784 range => [0, 0, 100, 10], 2059 range => [0, 0, 100, 10],
1785 req_w => 20, 2060 req_w => $::WIDTH / 80,
1786 req_h => 20, 2061 req_h => $::WIDTH / 80,
1787 vertical => 0, 2062 vertical => 0,
1788 can_hover => 1, 2063 can_hover => 1,
1789 inner_pad => 5, 2064 inner_pad => 0.02,
1790 @_ 2065 @_
1791 ); 2066 );
1792 2067
2068 $self->set_value ($self->{range}[0]);
2069 $self->update;
2070
1793 $self 2071 $self
2072}
2073
2074sub set_value {
2075 my ($self, $value) = @_;
2076
2077 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078
2079 $hi = $lo + 1 if $hi <= $lo;
2080
2081 $value = $lo if $value < $lo;
2082 $value = $hi if $value > $hi;
2083
2084 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085 if $unit;
2086
2087 $page = $hi - $lo if $page > $hi - $lo;
2088
2089 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090
2091 if ($value != $old_value) {
2092 $self->emit (changed => $value);
2093 $self->update;
2094 }
1794} 2095}
1795 2096
1796sub size_request { 2097sub size_request {
1797 my ($self) = @_; 2098 my ($self) = @_;
1798 2099
… …
1811 2112
1812sub mouse_motion { 2113sub mouse_motion {
1813 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1814 2115
1815 if ($GRAB == $self) { 2116 if ($GRAB == $self) {
2117 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118
2119 my (undef, $lo, $hi, $page) = @{$self->{range}};
2120
2121 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2122
2123 $self->set_value ($x * ($hi - $lo) + $lo);
2124 }
2125}
2126
2127sub update {
2128 my ($self) = @_;
2129
2130 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2131 $self->set_value ($self->{range}[0]);
2132
1816 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2133 my ($value, $lo, $hi, $page) = @{$self->{range}};
1817 2134
1818 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2135 my $inner_w = 1 - 2 * $self->{inner_pad};
1819 2136
1820 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2137 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1821 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1822 2138
1823 $x -= $inner_pad_px; # substract the padding 2139 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1824 $x = $x * ($hi - $lo) / $inner_w + $lo; 2140 $value = $self->{scale} * ($value - $lo);
1825 $x = $lo if $x < $lo;
1826 $x = $hi - $page if $x > $hi - $page;
1827 $self->{range}[0] = $x;
1828 2141
1829 $self->emit (changed => $x); 2142 $value = $self->{inner_pad} + ($value - $page * 0.5);
1830 $self->update; 2143
2144 $value = 0 if $value < 0;
2145 $page = 1 - $value if $value + $page > 1;
2146
2147 $self->{knob_x} = $value;
2148 $self->{knob_w} = $page;
1831 } 2149 });
1832}
1833 2150
1834# the inner_* stuff is for generating a padding for the slider handle, 2151 $self->SUPER::update;
1835# so that the handle doesn't leave the texture. This calculation isn't 100%
1836# correct propably, but it does the job for now
1837sub _calc_inner_pad_px {
1838 my ($self, $w) = @_;
1839 ($w / 100) * $self->{inner_pad} # % to pixels
1840} 2152}
1841 2153
1842sub _draw { 2154sub _draw {
1843 my ($self) = @_; 2155 my ($self) = @_;
1844 2156
1845 $self->SUPER::_draw (); 2157 $self->SUPER::_draw ();
1846 2158
1847 my ($w, $h) = @$self{qw(w h)}; 2159 glScale $self->{w}, $self->{h};
1848 2160
1849 if ($self->{vertical}) { 2161 if ($self->{vertical}) {
1850 # draw a vertical slider like a rotated horizontal slider 2162 # draw a vertical slider like a rotated horizontal slider
1851 2163
2164 glTranslate 1, 0, 0;
1852 glRotate 90, 0, 0, 1; 2165 glRotate 90, 0, 0, 1;
1853 glTranslate 0, -$self->{w}, 0;
1854
1855 ($w, $h) = ($h, $w);
1856 } 2166 }
1857 2167
1858 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2168 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1859 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2169 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1860 2170
1861 my ($value, $lo, $hi, $page) = @{$self->{range}};
1862
1863 $hi = $value + 1 if $lo == $hi;
1864
1865 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1866 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1867
1868 $page = int $page * $inner_w / ($hi - $lo);
1869 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1870
1871 $w -= $page;
1872 $page &= ~1;
1873 glTranslate $page * 0.5, 0, 0;
1874 $page ||= 2;
1875
1876 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1877 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1878
1879 glEnable GL_BLEND;
1880 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1881 glEnable GL_TEXTURE_2D; 2171 glEnable GL_TEXTURE_2D;
1882 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2172 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1883 2173
1884 # draw background 2174 # draw background
1885 $tex[1]->draw_quad (0, 0, $w, $h); 2175 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1886 2176
1887 # draw handle 2177 # draw handle
1888 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2178 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1889 2179
1890 glDisable GL_BLEND;
1891 glDisable GL_TEXTURE_2D; 2180 glDisable GL_TEXTURE_2D;
1892} 2181}
1893 2182
1894############################################################################# 2183#############################################################################
1895 2184
… …
1901 2190
1902sub new { 2191sub new {
1903 my $class = shift; 2192 my $class = shift;
1904 2193
1905 my $self = $class->SUPER::new ( 2194 my $self = $class->SUPER::new (
1906 fontsize => 1, 2195 fontsize => 1,
2196 can_events => 0,
2197 #font => default_font
1907 @_, 2198 @_,
1908 2199
1909 layout => (new CFClient::Layout), 2200 layout => (new CFClient::Layout 1),
1910 par => [], 2201 par => [],
1911 height => 0, 2202 height => 0,
1912 children => [ 2203 children => [
1913 (new CFClient::UI::Empty expand => 1), 2204 (new CFClient::UI::Empty expand => 1),
1914 (new CFClient::UI::Slider vertical => 1), 2205 (new CFClient::UI::Slider vertical => 1),
1915 ], 2206 ],
1916 ); 2207 );
1917 2208
1918 $self->{children}[1]->connect (changed => sub { 2209 $self->{children}[1]->connect (changed => sub { $self->update });
1919 $self->update;
1920 });
1921 2210
1922 $self 2211 $self
1923} 2212}
1924 2213
1925sub set_fontsize { 2214sub set_fontsize {
… …
1927 2216
1928 $self->{fontsize} = $fontsize; 2217 $self->{fontsize} = $fontsize;
1929 $self->reflow; 2218 $self->reflow;
1930} 2219}
1931 2220
2221sub size_allocate {
2222 my ($self, $w, $h) = @_;
2223
2224 $self->SUPER::size_allocate ($w, $h);
2225
2226 $self->{layout}->set_font ($self->{font}) if $self->{font};
2227 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2228 $self->{layout}->set_width ($self->{children}[0]{w});
2229
2230 $self->reflow;
2231}
2232
1932sub text_height { 2233sub text_height {
1933 my ($self, $text) = @_; 2234 my ($self, $text, $indent) = @_;
1934 2235
1935 my $layout = $self->{layout}; 2236 my $layout = $self->{layout};
1936 2237
1937 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2238 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1938 $layout->set_width ($self->{w}); 2239 $layout->set_width ($self->{children}[0]{w} - $indent);
1939 $layout->set_text ($text); 2240 $layout->set_markup ($text);
1940 2241
1941 ($layout->size)[1] 2242 ($layout->size)[1]
1942} 2243}
1943 2244
1944sub reflow { 2245sub reflow {
… …
1946 2247
1947 $self->{need_reflow}++; 2248 $self->{need_reflow}++;
1948 $self->update; 2249 $self->update;
1949} 2250}
1950 2251
1951sub size_allocate {
1952 my ($self, $w, $h) = @_;
1953
1954 $self->SUPER::size_allocate ($w, $h);
1955
1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1957 $self->{layout}->set_width ($self->{children}[0]{w});
1958
1959 $self->reflow;
1960}
1961
1962sub add_paragraph { 2252sub add_paragraph {
1963 my ($self, $color, $text) = @_; 2253 my ($self, $color, $text, $indent) = @_;
1964 2254
1965 #TODO: intelligently "reformat" paragraph 2255 #TODO: intelligently "reformat" paragraph
1966 2256
2257 for my $line (split /\n/, $text) {
1967 my $height = $self->text_height ($text); 2258 my $height = $self->text_height ($line);
1968
1969 $self->{height} += $height; 2259 $self->{height} += $height;
1970
1971 push @{$self->{par}}, [$height, $color, $text]; 2260 push @{$self->{par}}, [$height, $color, $indent, $line];
2261 }
1972 2262
1973 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2263 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1974 $self->{children}[1]->update; 2264 $self->{children}[1]->update;
1975} 2265}
1976 2266
… …
1981 2271
1982 return unless $self->{h} > 0; 2272 return unless $self->{h} > 0;
1983 2273
1984 delete $self->{texture}; 2274 delete $self->{texture};
1985 2275
1986 $ROOT->on_refresh ($self, sub { 2276 $ROOT->on_post_alloc ($self, sub {
1987 if (delete $self->{need_reflow}) { 2277 if (delete $self->{need_reflow}) {
1988 my $height = 0; 2278 my $height = 0;
1989 2279
1990 $height += $_->[0] = $self->text_height ($_->[2]) 2280 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
1991 for @{$self->{par}}; 2281 for @{$self->{par}};
1992 2282
1993 $self->{height} = $height; 2283 $self->{height} = $height;
1994 2284
1995 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2285 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2286 $self->{children}[1]->update;
1996 2287
1997 delete $self->{texture}; 2288 delete $self->{texture};
1998 } 2289 }
1999 2290
2000 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2291 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2001 glClearColor 0, 0, 0, 1; 2292 glClearColor 0.5, 0.5, 0.5, 0;
2002 glClear GL_COLOR_BUFFER_BIT; 2293 glClear GL_COLOR_BUFFER_BIT;
2003
2004 glEnable GL_BLEND;
2005 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2006 glEnable GL_TEXTURE_2D;
2007 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2008 2294
2009 my $top = int $self->{children}[1]{range}[0]; 2295 my $top = int $self->{children}[1]{range}[0];
2010 2296
2011 my $y0 = $top; 2297 my $y0 = $top;
2012 my $y1 = $top + $self->{h}; 2298 my $y1 = $top + $self->{h};
2013 2299
2014 my $y = 0; 2300 my $y = 0;
2015 2301
2016 my $layout = $self->{layout}; 2302 my $layout = $self->{layout};
2017 2303
2304 $layout->set_font ($self->{font}) if $self->{font};
2305
2306 glEnable GL_BLEND;
2307 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308
2018 for my $par (@{$self->{par}}) { 2309 for my $par (@{$self->{par}}) {
2019 my $h = $par->[0]; 2310 my $h = $par->[0];
2020 2311
2021 if ($y0 < $y + $h && $y < $y1) { 2312 if ($y0 < $y + $h && $y < $y1) {
2313 $layout->set_foreground (@{ $par->[1] });
2314 $layout->set_width ($self->{w} - $par->[2]);
2022 $layout->set_text ($par->[2]); 2315 $layout->set_markup ($par->[3]);
2023 2316
2024 glColor @{ $par->[1] }; 2317 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2025 my ($W, $H) = $layout->size; 2318
2026 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2319 glRasterPos $par->[2], $y - $y0;
2320 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2027 } 2321 }
2028 2322
2029 $y += $h; 2323 $y += $h;
2030 } 2324 }
2031 2325
2032 glDisable GL_TEXTURE_2D;
2033 glDisable GL_BLEND; 2326 glDisable GL_BLEND;
2034 }; 2327 };
2035 }); 2328 });
2036} 2329}
2037 2330
2038sub _draw { 2331sub _draw {
2039 my ($self) = @_; 2332 my ($self) = @_;
2040 2333
2041 if ($self->{texture}) {
2042 glEnable GL_TEXTURE_2D; 2334 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2336 glColor 1, 1, 1, 1;
2044 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2337 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2045 glDisable GL_TEXTURE_2D; 2338 glDisable GL_TEXTURE_2D;
2046 }
2047 2339
2048 $self->{children}[1]->draw; 2340 $self->{children}[1]->draw;
2049 2341
2050} 2342}
2051 2343
… …
2099 2391
2100sub new { 2392sub new {
2101 my $class = shift; 2393 my $class = shift;
2102 2394
2103 my $self = $class->SUPER::new ( 2395 my $self = $class->SUPER::new (
2104 state => 0, 2396 state => 0,
2105 connect_activate => \&toggle_flopper, 2397 connect_activate => \&toggle_flopper,
2106 can_events => 1,
2107 @_ 2398 @_
2108 ); 2399 );
2109 2400
2110 if ($self->{state}) { 2401 if ($self->{state}) {
2111 $self->{state} = 0; 2402 $self->{state} = 0;
… …
2146 @_, 2437 @_,
2147 can_events => 0, 2438 can_events => 0,
2148 ) 2439 )
2149} 2440}
2150 2441
2151sub set_text { 2442sub set_tooltip_from {
2152 my ($self, $text) = @_; 2443 my ($self, $widget) = @_;
2153 2444
2154 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2445 $self->add (new CFClient::UI::Label
2155 $self->{label}->set_text ($text); 2446 markup => $widget->{tooltip},
2156 $self->add ($self->{label}); 2447 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2448 fontsize => 0.8,
2449 fg => [0, 0, 0, 1],
2450 ellipsise => 0,
2451 font => ($widget->{tooltip_font} || $::FONT_PROP),
2452 );
2157} 2453}
2158 2454
2159sub size_request { 2455sub size_request {
2160 my ($self) = @_; 2456 my ($self) = @_;
2161 2457
2162 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2458 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2163 2459
2164 $w = List::Util::min $::WIDTH * 0.2, $w;
2165 $h = List::Util::max $::HEIGHT * 0.2, $h;
2166
2167 ($w + 4, $h + 4) 2460 ($w + 4, $h + 4)
2168} 2461}
2169 2462
2463sub size_allocate {
2464 my ($self, $w, $h) = @_;
2465
2466 $self->SUPER::size_allocate ($w - 4, $h - 4);
2467}
2468
2170sub _draw { 2469sub _draw {
2171 my ($self) = @_; 2470 my ($self) = @_;
2172 2471
2173 glPushMatrix;
2174 glTranslate 0.375, 0.375; 2472 glTranslate 0.375, 0.375;
2175 2473
2176 my ($w, $h) = @$self{qw(w h)}; 2474 my ($w, $h) = @$self{qw(w h)};
2177 2475
2178 glColor 1, 0.8, 0.4; 2476 glColor 1, 0.8, 0.4;
… …
2189 glVertex 0 , $h; 2487 glVertex 0 , $h;
2190 glVertex $w, $h; 2488 glVertex $w, $h;
2191 glVertex $w, 0; 2489 glVertex $w, 0;
2192 glEnd; 2490 glEnd;
2193 2491
2194 glPopMatrix; 2492 glTranslate 2 - 0.375, 2 - 0.375;
2195
2196 glTranslate 2, 2;
2197 $self->SUPER::_draw; 2493 $self->SUPER::_draw;
2198} 2494}
2199 2495
2200############################################################################# 2496#############################################################################
2201 2497
2498package CFClient::UI::Face;
2499
2500our @ISA = CFClient::UI::Base::;
2501
2502use CFClient::OpenGL;
2503
2504sub new {
2505 my $class = shift;
2506
2507 my $self = $class->SUPER::new (
2508 aspect => 1,
2509 @_,
2510 );
2511
2512 if ($self->{anim} && $self->{animspeed}) {
2513 Scalar::Util::weaken (my $widget = $self);
2514
2515 $self->{timer} = Event->timer (
2516 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2517 hard => 1,
2518 interval => $self->{animspeed},
2519 cb => sub {
2520 ++$widget->{frame};
2521 $widget->update;
2522 },
2523 );
2524 }
2525
2526 $self
2527}
2528
2529sub size_request {
2530 (32, 8)
2531}
2532
2533sub update {
2534 my ($self) = @_;
2535
2536 return unless $self->{visible};
2537
2538 $self->SUPER::update;
2539}
2540
2541sub _draw {
2542 my ($self) = @_;
2543
2544 return unless $::CONN;#d# manage and cache textures differently
2545
2546 my $face;
2547
2548 if ($self->{frame}) {
2549 my $anim = $::CONN->{anim}[$self->{anim}];
2550
2551 $face = $anim->[ $self->{frame} % @$anim ]
2552 if $anim && @$anim;
2553 }
2554
2555 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2556
2557 if ($tex) {
2558 glEnable GL_TEXTURE_2D;
2559 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2560 glColor 1, 1, 1, 1;
2561 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2562 glDisable GL_TEXTURE_2D;
2563 }
2564}
2565
2566sub DESTROY {
2567 my ($self) = @_;
2568
2569 $self->{timer}->cancel
2570 if $self->{timer};
2571
2572 $self->SUPER::DESTROY;
2573}
2574
2575#############################################################################
2576
2577package CFClient::UI::InventoryItem;
2578
2579our @ISA = CFClient::UI::HBox::;
2580
2581sub _item_to_desc {
2582 my ($item) = @_;
2583
2584 my $desc =
2585 $item->{nrof} < 2
2586 ? $item->{name}
2587 : "$item->{nrof} × $item->{name_pl}";
2588
2589 $item->{flags} & Crossfire::Protocol::F_OPEN
2590 and $desc .= " (open)";
2591 $item->{flags} & Crossfire::Protocol::F_APPLIED
2592 and $desc .= " (applied)";
2593 $item->{flags} & Crossfire::Protocol::F_UNPAID
2594 and $desc .= " (unpaid)";
2595 $item->{flags} & Crossfire::Protocol::F_MAGIC
2596 and $desc .= " (magic)";
2597 $item->{flags} & Crossfire::Protocol::F_CURSED
2598 and $desc .= " (cursed)";
2599 $item->{flags} & Crossfire::Protocol::F_DAMNED
2600 and $desc .= " (damned)";
2601 $item->{flags} & Crossfire::Protocol::F_LOCKED
2602 and $desc .= " *";
2603
2604 $desc
2605}
2606
2607sub new {
2608 my $class = shift;
2609
2610 my %args = @_;
2611
2612 my $item = delete $args{item};
2613
2614 my $desc = _item_to_desc ($item);
2615
2616 my $self = $class->SUPER::new (
2617 can_hover => 1,
2618 can_events => 1,
2619 tooltip => ((CFClient::UI::Label::escape $desc)
2620 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2621 connect_button_down => sub {
2622 my ($self, $ev, $x, $y) = @_;
2623
2624 # todo: maybe put examine on 1? but should just be a tooltip :(
2625 if ($ev->{button} == 1) {
2626 my $targ = $::CONN->{player}{tag};
2627
2628 if ($item->{container} == $::CONN->{player}{tag}) {
2629 $targ = $main::OPENCONT;
2630 }
2631
2632 $::CONN->send ("move $targ $item->{tag} 0");
2633 } elsif ($ev->{button} == 2) {
2634 $::CONN->send ("apply $item->{tag}");
2635 } elsif ($ev->{button} == 3) {
2636 my @menu_items = (
2637 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2638 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2639 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640 (
2641 $item->{flags} & Crossfire::Protocol::F_LOCKED
2642 ? (
2643 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644 )
2645 : (
2646 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2647 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648 )
2649 ),
2650 );
2651
2652 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2653 }
2654
2655 1
2656 },
2657 %args
2658 );
2659
2660
2661 $self->add (new CFClient::UI::Face
2662 can_events => 0,
2663 face => $item->{face},
2664 anim => $item->{anim},
2665 animspeed => $item->{animspeed},
2666 );
2667
2668 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2669
2670 $self->{item} = $item;
2671
2672 $self->update_item;
2673
2674 $self
2675}
2676
2677sub update_item {
2678 my ($self) = @_;
2679
2680 my $desc = _item_to_desc ($self->{item});
2681
2682 $self->{name_lbl}->set_text ($desc);
2683}
2684
2685#############################################################################
2686
2687package CFClient::UI::Inventory;
2688
2689our @ISA = CFClient::UI::ScrolledWindow::;
2690
2691sub new {
2692 my $class = shift;
2693
2694 my $self = $class->SUPER::new (
2695 scrolled => (new CFClient::UI::VBox),
2696 @_,
2697 );
2698
2699 $self
2700}
2701
2702sub set_items {
2703 my ($self, $items) = @_;
2704
2705 $self->{scrolled}->clear;
2706 return unless $items;
2707
2708 my @items = sort {
2709 ($a->{type} <=> $b->{type})
2710 or ($a->{name} cmp $b->{name})
2711 } @$items;
2712
2713 $self->{real_items} = \@items;
2714
2715 for my $item (@items) {
2716 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2717 $item->update_item ();
2718 }
2719
2720 $self->{scrolled}->add (@items);
2721
2722# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2723}
2724
2725sub size_request {
2726 my ($self) = @_;
2727 ($self->{req_w}, $self->{req_h});
2728}
2729
2730#############################################################################
2731
2732package CFClient::UI::Menu;
2733
2734our @ISA = CFClient::UI::FancyFrame::;
2735
2736use CFClient::OpenGL;
2737
2738sub new {
2739 my $class = shift;
2740
2741 my $self = $class->SUPER::new (
2742 items => [],
2743 z => 100,
2744 @_,
2745 );
2746
2747 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2748
2749 for my $item (@{ $self->{items} }) {
2750 my ($widget, $cb) = @$item;
2751
2752 # handle various types of items, only text for now
2753 if (!ref $widget) {
2754 $widget = new CFClient::UI::Label
2755 can_hover => 1,
2756 can_events => 1,
2757 text => $widget;
2758 }
2759
2760 $self->{item}{$widget} = $item;
2761
2762 $self->{vbox}->add ($widget);
2763 }
2764
2765 $self
2766}
2767
2768# popup given the event (must be a mouse button down event currently)
2769sub popup {
2770 my ($self, $ev) = @_;
2771
2772 $self->emit ("popdown");
2773
2774 # maybe save $GRAB? must be careful about events...
2775 $GRAB = $self;
2776 $self->{button} = $ev->{button};
2777
2778 $self->show;
2779 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2780}
2781
2782sub mouse_motion {
2783 my ($self, $ev, $x, $y) = @_;
2784
2785 # TODO: should use vbox->find_widget or so
2786 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2787 $self->{hover} = $self->{item}{$HOVER};
2788}
2789
2790sub button_up {
2791 my ($self, $ev, $x, $y) = @_;
2792
2793 if ($ev->{button} == $self->{button}) {
2794 undef $GRAB;
2795 $self->hide;
2796
2797 $self->emit ("popdown");
2798 $self->{hover}[1]->() if $self->{hover};
2799 }
2800}
2801
2802#############################################################################
2803
2804package CFClient::UI::Statusbox;
2805
2806our @ISA = CFClient::UI::VBox::;
2807
2808sub new {
2809 my $class = shift;
2810
2811 $class->SUPER::new (
2812 fontsize => 0.8,
2813 @_,
2814 )
2815}
2816
2817sub reorder {
2818 my ($self) = @_;
2819 my $NOW = time;
2820
2821 while (my ($k, $v) = each %{ $self->{item} }) {
2822 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2823 }
2824
2825 my @widgets;
2826
2827 my @items = sort {
2828 $a->{pri} <=> $b->{pri}
2829 or $b->{id} <=> $a->{id}
2830 } values %{ $self->{item} };
2831
2832 my $count = 10 + 1;
2833 for my $item (@items) {
2834 last unless --$count;
2835
2836 push @widgets, $item->{label} ||= do {
2837 # TODO: doesn't handle markup well (read as: at all)
2838 my $short = $item->{count} > 1
2839 ? "<b>$item->{count} ×</b> $item->{text}"
2840 : $item->{text};
2841
2842 for ($short) {
2843 s/^\s+//;
2844 s/\s+/ /g;
2845 }
2846
2847 new CFClient::UI::Label
2848 markup => $short,
2849 tooltip => $item->{tooltip},
2850 tooltip_font => $::FONT_PROP,
2851 tooltip_width => 0.67,
2852 fontsize => $item->{fontsize} || $self->{fontsize},
2853 max_w => $::WIDTH * 0.44,
2854 fg => $item->{fg},
2855 can_events => 1,
2856 can_hover => 1
2857 };
2858 }
2859
2860 $self->clear;
2861 $self->SUPER::add (reverse @widgets);
2862}
2863
2864sub add {
2865 my ($self, $text, %arg) = @_;
2866
2867 $text =~ s/^\s+//;
2868 $text =~ s/\s+$//;
2869
2870 my $timeout = time + ((delete $arg{timeout}) || 60);
2871
2872 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873
2874 if (my $item = $self->{item}{$group}) {
2875 if ($item->{text} eq $text) {
2876 $item->{count}++;
2877 } else {
2878 $item->{count} = 1;
2879 $item->{text} = $item->{tooltip} = $text;
2880 }
2881 $item->{id} = ++$self->{id};
2882 $item->{timeout} = $timeout;
2883 delete $item->{label};
2884 } else {
2885 $self->{item}{$group} = {
2886 id => ++$self->{id},
2887 text => $text,
2888 timeout => $timeout,
2889 tooltip => $text,
2890 fg => [0.8, 0.8, 0.8, 0.8],
2891 pri => 0,
2892 count => 1,
2893 %arg,
2894 };
2895 }
2896
2897 $self->reorder;
2898}
2899
2900sub reconfigure {
2901 my ($self) = @_;
2902
2903 delete $_->{label}
2904 for values %{ $self->{item} || {} };
2905
2906 $self->reorder;
2907 $self->SUPER::reconfigure;
2908}
2909
2910#############################################################################
2911
2202package CFClient::UI::Root; 2912package CFClient::UI::Root;
2203 2913
2204our @ISA = CFClient::UI::Container::; 2914our @ISA = CFClient::UI::Container::;
2205 2915
2206use CFClient::OpenGL; 2916use CFClient::OpenGL;
2207 2917
2208sub check_size { 2918sub new {
2209 my ($self) = @_; 2919 my $class = shift;
2210 2920
2211 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2921 $class->SUPER::new (
2212} 2922 @_,
2213 2923 )
2214sub size_request {
2215 ($::WIDTH, $::HEIGHT)
2216} 2924}
2217 2925
2218sub configure { 2926sub configure {
2219 my ($self, $x, $y, $w, $h) = @_; 2927 my ($self, $x, $y, $w, $h) = @_;
2220 2928
2221 $self->SUPER::configure ($x, $y, $w, $h); 2929 $self->{w} = $w;
2930 $self->{h} = $h;
2931}
2222 2932
2933sub check_size {
2934 my ($self) = @_;
2935
2936 $self->size_allocate ($self->{w}, $self->{h})
2937 if $self->{w};
2938}
2939
2940sub size_request {
2941 my ($self) = @_;
2942
2943 ($self->{w}, $self->{h})
2944}
2945
2946sub size_allocate {
2947 my ($self, $w, $h) = @_;
2948
2949 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2950 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2951
2952 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2953 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2954
2223 for my $child (@{$self->{children}}) { 2955 for my $child ($self->children) {
2224 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2956 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2225 2957
2958 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2959 if exists $child->{req_x};
2960
2961 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2962 if exists $child->{req_y};
2963
2226 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2964 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2227 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2965 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966
2228 $child->configure ($X, $Y, $W,$H); 2967 $child->configure ($X, $Y, $W, $H);
2229 } 2968 }
2230} 2969}
2231 2970
2232sub _topleft { 2971sub coord2local {
2233 my ($self, $x, $y) = @_; 2972 my ($self, $x, $y) = @_;
2234 2973
2235 ($x, $y) 2974 ($x, $y)
2236} 2975}
2237 2976
2977sub coord2global {
2978 my ($self, $x, $y) = @_;
2979
2980 ($x, $y)
2981}
2982
2238sub update { 2983sub update {
2239 my ($self) = @_; 2984 my ($self) = @_;
2240 2985
2241 $self->check_size; 2986 $self->check_size;
2242 ::refresh (); 2987 $::WANT_REFRESH++;
2243} 2988}
2244 2989
2245sub add { 2990sub add {
2246 my ($self, $child) = @_; 2991 my ($self, @children) = @_;
2247 2992
2993 for my $child (@children) {
2994 $child->{toplevel} = 1;
2995
2248 # integerize window positions 2996 # integerise window positions
2249 $child->{x} = int $child->{x}; 2997 $child->{x} = int $child->{x};
2250 $child->{y} = int $child->{y}; 2998 $child->{y} = int $child->{y};
2999 }
2251 3000
2252 $self->SUPER::add ($child); 3001 $self->SUPER::add (@children);
3002
3003 while (@children) {
3004 my $w = pop @children;
3005 push @children, $w->children;
3006 $w->{visible} = 1;
3007 }
3008}
3009
3010sub remove {
3011 my ($self, @children) = @_;
3012
3013 $self->SUPER::remove (@children);
3014
3015 while (@children) {
3016 my $w = pop @children;
3017 push @children, $w->children;
3018 delete $w->{visible};
3019 }
2253} 3020}
2254 3021
2255sub on_refresh { 3022sub on_refresh {
2256 my ($self, $id, $cb) = @_; 3023 my ($self, $id, $cb) = @_;
2257 3024
2258 $self->{refresh_hook}{$id} = $cb; 3025 $self->{refresh_hook}{$id} = $cb;
2259} 3026}
2260 3027
3028sub on_post_alloc {
3029 my ($self, $id, $cb) = @_;
3030
3031 $self->{post_alloc_hook}{$id} = $cb;
3032}
3033
2261sub draw { 3034sub draw {
2262 my ($self) = @_; 3035 my ($self) = @_;
2263 3036
2264 while (my $rcb = delete $self->{refresh_hook}) { 3037 while ($self->{refresh_hook}) {
2265 $_->() for values %$rcb; 3038 $_->()
3039 for values %{delete $self->{refresh_hook}};
3040 }
3041
3042 if ($self->{check_size}) {
3043 my @queue = ([], []);
3044
3045 for (;;) {
3046 if ($self->{check_size}) {
3047 # heuristic: check containers last
3048 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3049 for values %{delete $self->{check_size}}
3050 }
3051
3052 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3053
3054 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3055 ? @$widget{qw(user_w user_h)}
3056 : $widget->size_request;
3057
3058 if (delete $widget->{force_alloc}
3059 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3060 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3061
3062 $widget->{req_w} = $w;
3063 $widget->{req_h} = $h;
3064
3065 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3066
3067 $widget->{parent}->check_size
3068 if $widget->{parent};
3069 }
3070 }
3071 }
3072
3073 while ($self->{size_alloc}) {
3074 for (values %{delete $self->{size_alloc}}) {
3075 my ($widget, $w, $h) = @$_;
3076
3077 $w = 0 if $w < 0;
3078 $h = 0 if $h < 0;
3079
3080 $widget->{w} = $w;
3081 $widget->{h} = $h;
3082 $widget->size_allocate ($w, $h);
3083 $widget->emit (size_allocate => $w, $h);
3084 }
3085 }
3086
3087 while ($self->{post_alloc_hook}) {
3088 $_->()
3089 for values %{delete $self->{post_alloc_hook}};
2266 } 3090 }
2267 3091
2268 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3092 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2269 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3093 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2270 glClear GL_COLOR_BUFFER_BIT; 3094 glClear GL_COLOR_BUFFER_BIT;
2271 3095
2272 glMatrixMode GL_PROJECTION; 3096 glMatrixMode GL_PROJECTION;
2273 glLoadIdentity; 3097 glLoadIdentity;
2274 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3098 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2275 glMatrixMode GL_MODELVIEW; 3099 glMatrixMode GL_MODELVIEW;
2276 glLoadIdentity; 3100 glLoadIdentity;
2277 3101
2278 $self->_draw; 3102 $self->_draw;
2279} 3103}
… …
2281############################################################################# 3105#############################################################################
2282 3106
2283package CFClient::UI; 3107package CFClient::UI;
2284 3108
2285$ROOT = new CFClient::UI::Root; 3109$ROOT = new CFClient::UI::Root;
2286$TOOLTIP = new CFClient::UI::Tooltip; 3110$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2287 3111
22881 31121
2289 3113

Diff Legend

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