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

Diff Legend

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