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

Diff Legend

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