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

Diff Legend

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