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.157 by root, Sun Apr 23 21:47:32 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;
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_text ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $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;
31 } 42 }
32 43
33 return; 44 return;
34 } 45 }
35 } 46 }
… …
39 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
40} 51}
41 52
42# class methods for events 53# class methods for events
43sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
56 if $FOCUS;
45} 57}
46 58
47sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
61 if $FOCUS;
49} 62}
50 63
51sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
52 my ($ev) = @_; 65 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 74 check_tooltip;
62 } 75 }
63 76
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 78
66 $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 }
67} 83}
68 84
69sub feed_sdl_button_up_event { 85sub feed_sdl_button_up_event {
70 my ($ev) = @_; 86 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 87 my ($x, $y) = ($ev->{x}, $ev->{y});
72 88
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 89 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 90
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 92
77 $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 }
78 97
79 if (!$BUTTON_STATE) { 98 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 99 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 100 $grab->update if $grab;
82 $GRAB->update if $GRAB; 101 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 117 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 118
100 check_tooltip; 119 check_tooltip;
101 } 120 }
102 121
103 $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 }
104} 126}
105 127
106# convert position array to integers 128# convert position array to integers
107sub harmonize { 129sub harmonize {
108 my ($vals) = @_; 130 my ($vals) = @_;
… …
114 $rem += $_ - $i; 136 $rem += $_ - $i;
115 $_ = $i; 137 $_ = $i;
116 } 138 }
117} 139}
118 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
119############################################################################# 164#############################################################################
120 165
121package CFClient::UI::Base; 166package CFClient::UI::Base;
122 167
123use strict; 168use strict;
… …
126 171
127sub new { 172sub new {
128 my $class = shift; 173 my $class = shift;
129 174
130 my $self = bless { 175 my $self = bless {
131 x => 0, 176 x => 0,
132 y => 0, 177 y => 0,
133 z => 0, 178 z => 0,
134 can_events => 1, 179 can_events => 1,
135 @_ 180 @_
136 }, $class; 181 }, $class;
137 182
138 for (keys %$self) { 183 for (keys %$self) {
139 if (/^connect_(.*)$/) { 184 if (/^connect_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 185 $self->connect ($1 => delete $self->{$_});
141 } 186 }
142 } 187 }
143 188
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
144 $self 191 $self
145} 192}
146 193
194sub destroy {
195 my ($self) = @_;
196
197 $self->hide;
198 %$self = ();
199}
200
147sub show { 201sub show {
148 my ($self) = @_; 202 my ($self) = @_;
149 203
150 return if $self->{parent}; 204 return if $self->{parent};
151 205
… …
153} 207}
154 208
155sub hide { 209sub hide {
156 my ($self) = @_; 210 my ($self) = @_;
157 211
158 return unless $self->{parent}; 212 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self;
159 214
160 $self->{parent}->remove ($self); 215 $self->{parent}->remove ($self)
216 if $self->{parent};
161} 217}
162 218
163sub move { 219sub move {
164 my ($self, $x, $y, $z) = @_; 220 my ($self, $x, $y, $z) = @_;
165 221
… …
168 $self->{z} = $z if defined $z; 224 $self->{z} = $z if defined $z;
169 225
170 $self->update; 226 $self->update;
171} 227}
172 228
173sub needs_redraw { 229sub set_size {
174 0 230 my ($self, $w, $h) = @_;
231
232 $self->{user_w} = $w;
233 $self->{user_h} = $h;
234
235 $self->check_size;
175} 236}
176 237
177sub size_request { 238sub size_request {
178 require Carp; 239 require Carp;
179 Carp::confess "size_request is abstract"; 240 Carp::confess "size_request is abstract";
… …
199 $self->{y} = $y; 260 $self->{y} = $y;
200 $self->update; 261 $self->update;
201 } 262 }
202 263
203 if ($self->{w} != $w || $self->{h} != $h) { 264 if ($self->{w} != $w || $self->{h} != $h) {
204 $self->{w} = $w; 265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
205 $self->{h} = $h;
206
207 $self->size_allocate ($w, $h);
208 $self->update;
209 } 266 }
210} 267}
211 268
212sub size_allocate { 269sub size_allocate {
213 # nothing to be done 270 # nothing to be done
214} 271}
215 272
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children {
281}
282
216sub set_max_size { 283sub set_max_size {
217 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
218 285
219 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
220 delete $self->{max_h}; $self->{max_h} = $h if $h; 287 delete $self->{max_h}; $self->{max_h} = $h if $h;
221} 288}
222 289
223# return top left coordinates 290sub set_tooltip {
224sub _topleft {
225 my ($self, $x, $y) = @_; 291 my ($self, $tooltip) = @_;
226 292
227 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 293 $self->{tooltip} = $tooltip;
294
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip;
298 }
228} 299}
229 300
230# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
231sub coord2local { 302sub coord2local {
232 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
233 304
234 my ($X, $Y) = $self->_topleft; 305 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
235 ($x - $X, $y - $Y)
236} 306}
237 307
238# translate local coordinates to global coordinate system 308# translate local coordinates to global coordinate system
239sub coord2global { 309sub coord2global {
240 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
241 311
242 my ($X, $Y) = $self->_topleft; 312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
243 ($x + $X, $y + $Y)
244} 313}
245 314
246sub focus_in { 315sub focus_in {
247 my ($self) = @_; 316 my ($self) = @_;
248 317
… …
308 glVertex $x + $self->{w}, $y + $self->{h}; 377 glVertex $x + $self->{w}, $y + $self->{h};
309 glVertex $x , $y + $self->{h}; 378 glVertex $x , $y + $self->{h};
310 glEnd; 379 glEnd;
311 glDisable GL_BLEND; 380 glDisable GL_BLEND;
312 } 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 }
313} 396}
314 397
315sub _draw { 398sub _draw {
316 my ($self) = @_; 399 my ($self) = @_;
317 400
… …
332 415
333sub set_parent { 416sub set_parent {
334 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
335 418
336 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};
337} 424}
338 425
339sub check_size { 426sub check_size {
340 my ($self) = @_; 427 my ($self, $forced) = @_;
341 428
342 return unless $self->{parent}; 429 $self->{force_alloc} = 1 if $forced;
343 430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
344 my ($w, $h) = $self->size_request;
345
346 if ($w != $self->{req_w} || $h != $self->{req_h}) {
347 $self->{req_w} = $w;
348 $self->{req_h} = $h;
349
350 $self->{parent}->check_size;
351 }
352} 431}
353 432
354sub update { 433sub update {
355 my ($self) = @_; 434 my ($self) = @_;
356 435
… …
365} 444}
366 445
367sub emit { 446sub emit {
368 my ($self, $signal, @args) = @_; 447 my ($self, $signal, @args) = @_;
369 448
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371 $cb->($self, @args);
372 }
373} 450}
374 451
375sub DESTROY { 452sub DESTROY {
376 my ($self) = @_; 453 my ($self) = @_;
377 454
455 delete $WIDGET{$self+0};
378 #$self->deactivate; 456 #$self->deactivate;
379} 457}
380 458
381############################################################################# 459#############################################################################
382 460
… …
391 my $class = shift; 469 my $class = shift;
392 470
393 # range [value, low, high, page] 471 # range [value, low, high, page]
394 472
395 $class->SUPER::new ( 473 $class->SUPER::new (
396 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
397 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
398 @_ 476 @_
399 ) 477 )
400} 478}
401 479
402sub _draw { 480sub _draw {
403 my ($self) = @_; 481 my ($self) = @_;
404 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
405 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
406 489
407 glEnable GL_BLEND; 490 glEnable GL_BLEND;
408 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
409 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
410 493
411 glBegin GL_QUADS; 494 glBegin GL_QUADS;
412 glVertex 0 , 0; 495 glVertex 0 , 0;
413 glVertex 0 , $h; 496 glVertex 0 , $h;
414 glVertex $w, $h; 497 glVertex $w, $h;
415 glVertex $w, 0; 498 glVertex $w, 0;
416 glEnd; 499 glEnd;
417 500
418 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
419} 503}
420 504
421############################################################################# 505#############################################################################
422 506
423package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
444sub new { 528sub new {
445 my ($class, %arg) = @_; 529 my ($class, %arg) = @_;
446 530
447 my $children = delete $arg{children} || []; 531 my $children = delete $arg{children} || [];
448 532
449 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 );
450 $self->add ($_) for @$children; 538 $self->add ($_) for @$children;
451 539
452 $self 540 $self
453} 541}
454 542
455sub add { 543sub add {
456 my ($self, $child) = @_; 544 my ($self, @widgets) = @_;
457 545
458 $child->set_parent ($self); 546 $_->set_parent ($self)
547 for @widgets;
459 548
460 use sort 'stable'; 549 use sort 'stable';
461 550
462 $self->{children} = [ 551 $self->{children} = [
463 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
464 @{$self->{children}}, $child 553 @{$self->{children}}, @widgets
465 ]; 554 ];
466 555
467 $child->check_size; 556 $self->check_size (1);
557 $self->update;
558}
559
560sub children {
561 @{ $_[0]{children} }
468} 562}
469 563
470sub remove { 564sub remove {
471 my ($self, $child) = @_; 565 my ($self, $child) = @_;
472 566
473 delete $child->{parent}; 567 delete $child->{parent};
568 $child->hide;
474 569
475 $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 }
476 586
477 $self->check_size; 587 $self->check_size;
478 $self->update; 588 $self->update;
479} 589}
480 590
… …
558} 668}
559 669
560sub update { 670sub update {
561 my ($self) = @_; 671 my ($self) = @_;
562 672
563 # we want to do this delayed... 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
564 $self->render_chld;
565 $self->SUPER::update; 674 $self->SUPER::update;
566}
567
568sub render_chld {
569 my ($self) = @_;
570
571 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
572 glClearColor 0, 0, 0, 1;
573 glClear GL_COLOR_BUFFER_BIT;
574 $self->child->draw;
575 };
576} 675}
577 676
578sub size_allocate { 677sub size_allocate {
579 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
580 679
581 $self->child->configure (0, 0, $w, $h); 680 $self->SUPER::size_allocate ($w, $h);
681 $self->update;
682}
582 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
583 $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 };
584} 704}
585 705
586sub _draw { 706sub _draw {
587 my ($self) = @_; 707 my ($self) = @_;
588 708
589 my ($w, $h) = ($self->w, $self->h); 709 my ($w, $h) = ($self->w, $self->h);
590 710
591 my $tex = $self->{texture} 711 my $tex = $self->{texture}
592 or return; 712 or return;
593 713
594 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
596 glEnable GL_TEXTURE_2D; 714 glEnable GL_TEXTURE_2D;
597 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;
598 717
599 $tex->draw_quad (0, 0, $w, $h); 718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
600 719
601 glDisable GL_BLEND;
602 glDisable GL_TEXTURE_2D; 720 glDisable GL_TEXTURE_2D;
603} 721}
604 722
605############################################################################# 723#############################################################################
606 724
607package CFClient::UI::ViewPort; 725package CFClient::UI::ViewPort;
608 726
609our @ISA = CFClient::UI::Window::; 727our @ISA = CFClient::UI::Window::;
610 728
611sub new { die }
612
613sub size_request { 729sub size_request {
614 my ($self) = @_; 730 my ($self) = @_;
615 731
616 @$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)};
617 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
618 734
619 @$self{qw(child_w child_h)} 735 @$self{qw(child_w child_h)}
620} 736}
621 737
622sub _draw { 738sub size_allocate {
623 my ($self) = @_; 739 my ($self, $w, $h) = @_;
624 740
625 $self->{children}[1]->draw; 741 $self->update;
626} 742}
627 743
744sub set_offset {
745 my ($self, $x, $y) = @_;
628 746
629############################################################################# 747 $self->{view_x} = int $x;
748 $self->{view_y} = int $y;
630 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
631package CFClient::UI::Frame; 791package CFClient::UI::ScrolledWindow;
632 792
633our @ISA = CFClient::UI::Bin::; 793our @ISA = CFClient::UI::HBox::;
634
635use CFClient::OpenGL;
636 794
637sub new { 795sub new {
638 my $class = shift; 796 my $class = shift;
639 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
640 my $self = $class->SUPER::new ( 808 $self = $class->SUPER::new (
641 bg => [1, 1, 1, 1], 809 vp => (new CFClient::UI::ViewPort),
642 border_bg => [1, 1, 1, 1], 810 slider => $slider,
643 border => 0.8,
644 @_ 811 @_,
645 ); 812 );
646 813
814 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp});
816 $self->add ($self->{slider});
817
647 $self 818 $self
648} 819}
649 820
650sub set_size { 821#TODO# update range on size_allocate depending on child
651 my ($self, $w, $h) = @_; 822# update viewport offset on scroll
652 $self->{req_w} = $w;
653 $self->{req_h} = $h;
654 $self->check_size;
655}
656 823
657sub size_request { 824#############################################################################
658 my ($self) = @_;
659 ($self->{req_w}, $self->{req_h})
660}
661 825
662sub size_allocate { 826package CFClient::UI::Frame;
663 my ($self, $w, $h) = @_; 827
664 $self->{w} = $w; 828our @ISA = CFClient::UI::Bin::;
665 $self->{h} = $h; 829
666 $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 )
667} 839}
668 840
669sub _draw { 841sub _draw {
670 my ($self) = @_; 842 my ($self) = @_;
671 843
672 my ($w, $h) = ($self->{w}, $self->{h}); 844 if ($self->{bg}) {
845 my ($w, $h) = @$self{qw(w h)};
673 846
674 glEnable GL_BLEND; 847 glEnable GL_BLEND;
675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
676 glEnable GL_TEXTURE_2D; 849 glColor @{ $self->{bg} };
677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
678 850
679# glBegin GL_QUADS; 851 glBegin GL_QUADS;
680# glColor 0, 0, 0, 0;
681# glVertex 0 , 0; 852 glVertex 0 , 0;
682# glVertex 0 , $h; 853 glVertex 0 , $h;
683# glVertex $w, $h; 854 glVertex $w, $h;
684# glVertex $w, 0; 855 glVertex $w, 0;
685# glEnd; 856 glEnd;
686 857
687
688 $self->child->draw;
689 glDisable GL_BLEND; 858 glDisable GL_BLEND;
690 glDisable GL_TEXTURE_2D; 859 }
860
861 $self->SUPER::_draw;
691} 862}
692 863
693############################################################################# 864#############################################################################
694 865
695package CFClient::UI::FancyFrame; 866package CFClient::UI::FancyFrame;
… …
706 my $class = shift; 877 my $class = shift;
707 878
708 # TODO: user_x, user_y, overwrite moveto? 879 # TODO: user_x, user_y, overwrite moveto?
709 880
710 my $self = $class->SUPER::new ( 881 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1], 882 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1], 883 border_bg => [1, 1, 1, 1],
713 border => 0.8, 884 border => 0.6,
885 toplevel => 1,
714 can_events => 1, 886 can_events => 1,
715 @_ 887 @_
716 ); 888 );
717 889
718 $self->{title} &&= new CFClient::UI::Label 890 $self->{title} &&= new CFClient::UI::Label
719 align => 0, 891 align => 0,
720 valign => 1, 892 valign => 1,
721 text => $self->{title}, 893 text => $self->{title},
722 fontsize => 1; 894 fontsize => $self->{border};
723 895
724 $self 896 $self
725} 897}
726 898
727sub border { 899sub border {
728 int $_[0]{border} * $::FONTSIZE 900 int $_[0]{border} * $::FONTSIZE
729} 901}
730 902
731sub size_request { 903sub size_request {
732 my ($self) = @_; 904 my ($self) = @_;
733
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735 905
736 my ($w, $h) = $self->SUPER::size_request; 906 my ($w, $h) = $self->SUPER::size_request;
737 907
738 ( 908 (
739 $w + $self->border * 2, 909 $w + $self->border * 2,
… …
745 my ($self, $w, $h) = @_; 915 my ($self, $w, $h) = @_;
746 916
747 $h -= List::Util::max 0, $self->border * 2; 917 $h -= List::Util::max 0, $self->border * 2;
748 $w -= List::Util::max 0, $self->border * 2; 918 $w -= List::Util::max 0, $self->border * 2;
749 919
750 $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)
751 if $self->{title}; 921 if $self->{title};
752 922
753 $self->child->configure ($self->border, $self->border, $w, $h); 923 $self->child->configure ($self->border, $self->border, $w, $h);
754} 924}
755 925
756sub button_down { 926sub button_down {
757 my ($self, $ev, $x, $y) = @_; 927 my ($self, $ev, $x, $y) = @_;
758 928
929 my ($w, $h) = @$self{qw(w h)};
759 my $border = $self->border; 930 my $border = $self->border;
760 931
761 if ($x < $self->{w} && $x >= $self->{w} - $border 932 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
762 && $y < $self->{h} && $y >= $self->{h} - $border) { 933 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
763 934
935 if ($lr & $td) {
936 my ($wx, $wy) = ($self->{x}, $self->{y});
764 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 937 my ($ox, $oy) = ($ev->{x}, $ev->{y});
765 my ($bw, $bh) = ($self->{w}, $self->{h}); 938 my ($bw, $bh) = ($self->{w}, $self->{h});
766 939
940 my $mx = $x < $border;
941 my $my = $y < $border;
942
767 $self->{motion} = sub { 943 $self->{motion} = sub {
768 my ($ev, $x, $y) = @_; 944 my ($ev, $x, $y) = @_;
769 945
770 ($x, $y) = ($ev->{x}, $ev->{y}); 946 my $dx = $ev->{x} - $ox;
947 my $dy = $ev->{y} - $oy;
771 948
772 $self->{user_w} = $bw + $x - $ox; 949 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
773 $self->{user_h} = $bh + $y - $oy; 950 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
951 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
774 $self->check_size; 952 $self->check_size;
775 }; 953 };
776 954
777 } elsif ($x >= 0 && $x < $self->{w} 955 } elsif ($lr ^ $td) {
778 && $y >= 0 && $y < $border) {
779
780 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 956 my ($ox, $oy) = ($ev->{x}, $ev->{y});
781 my ($bx, $by) = ($self->{x}, $self->{y}); 957 my ($bx, $by) = ($self->{x}, $self->{y});
782 958
783 $self->{motion} = sub { 959 $self->{motion} = sub {
784 my ($ev, $x, $y) = @_; 960 my ($ev, $x, $y) = @_;
… …
807 my ($self) = @_; 983 my ($self) = @_;
808 984
809 my ($w, $h ) = ($self->{w}, $self->{h}); 985 my ($w, $h ) = ($self->{w}, $self->{h});
810 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 986 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
811 987
812 glEnable GL_BLEND;
813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
814 glEnable GL_TEXTURE_2D; 988 glEnable GL_TEXTURE_2D;
815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
816 990
817 my $border = $self->border; 991 my $border = $self->border;
818 992
819 glColor @{ $self->{border_bg} }; 993 glColor @{ $self->{border_bg} };
820 $tex[1]->draw_quad (0, 0, $w, $border); 994 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
821 $tex[3]->draw_quad (0, $border, $border, $ch); 995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
822 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
823 $tex[4]->draw_quad (0, $h - $border, $w, $border); 997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
824 998
999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
825 my $bg = $tex[0]; 1000 my $bg = $tex[0];
826 1001
827 # TODO: repeat texture not scale 1002 # TODO: repeat texture not scale
828 my $rep_x = $cw / $bg->{w}; 1003 my $rep_x = $cw / $bg->{w};
829 my $rep_y = $ch / $bg->{h}; 1004 my $rep_y = $ch / $bg->{h};
830 1005
831 glColor @{ $self->{bg} }; 1006 glColor @{ $self->{bg} };
832 1007
833 $bg->{s} = $rep_x; 1008 $bg->{s} = $rep_x;
834 $bg->{t} = $rep_y; 1009 $bg->{t} = $rep_y;
835 $bg->{wrap_mode} = 1; 1010 $bg->{wrap_mode} = 1;
836 $bg->draw_quad ($border, $border, $cw, $ch); 1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 }
837 1013
838 glDisable GL_TEXTURE_2D; 1014 glDisable GL_TEXTURE_2D;
839 glDisable GL_BLEND;
840 1015
841 $self->{title}->draw if $self->{title}; 1016 $self->{title}->draw if $self->{title};
1017
842 $self->child->draw; 1018 $self->child->draw;
843} 1019}
844 1020
845############################################################################# 1021#############################################################################
846 1022
… …
868 $self->{children}[$y][$x] = $child; 1044 $self->{children}[$y][$x] = $child;
869 1045
870 $child->check_size; 1046 $child->check_size;
871} 1047}
872 1048
1049sub children {
1050 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1051}
1052
873# 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?
874sub clear { 1054sub clear {
875 my ($self) = @_; 1055 my ($self) = @_;
876 1056
1057 my @children = $self->children;
877 delete $self->{children}; 1058 delete $self->{children};
1059
1060 for (@children) {
1061 delete $_->{parent};
1062 $_->hide;
1063 }
1064
878 $self->update; 1065 $self->update;
879} 1066}
880 1067
881sub get_wh { 1068sub get_wh {
882 my ($self) = @_; 1069 my ($self) = @_;
… …
1059} 1246}
1060 1247
1061sub size_allocate { 1248sub size_allocate {
1062 my ($self, $w, $h) = @_; 1249 my ($self, $w, $h) = @_;
1063 1250
1251 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1064 my $children = $self->{children}; 1253 my $children = $self->{children};
1065 1254
1066 my @h = map $_->{req_h}, @$children; 1255 my @h = map $_->{req_h}, @$children;
1067 1256
1068 my $req_h = List::Util::sum @h; 1257 my $req_h = List::Util::sum @h;
… …
1097 1286
1098############################################################################# 1287#############################################################################
1099 1288
1100package CFClient::UI::Label; 1289package CFClient::UI::Label;
1101 1290
1102our @ISA = CFClient::UI::Base::; 1291our @ISA = CFClient::UI::DrawBG::;
1103 1292
1104use CFClient::OpenGL; 1293use CFClient::OpenGL;
1105 1294
1106sub new { 1295sub new {
1107 my ($class, %arg) = @_; 1296 my ($class, %arg) = @_;
1108 1297
1109 my $self = $class->SUPER::new ( 1298 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1299 fg => [1, 1, 1],
1300 #bg => none
1301 #active_bg => none
1111 #font => default_font 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),
1112 fontsize => 1, 1308 fontsize => 1,
1113 text => "",
1114 align => -1, 1309 align => -1,
1115 valign => -1, 1310 valign => -1,
1116 padding => 2, 1311 padding => 2,
1117 layout => new CFClient::Layout,
1118 can_events => 0, 1312 can_events => 0,
1119 %arg 1313 %arg
1120 ); 1314 );
1121 1315
1122 if (exists $self->{template}) { 1316 if (exists $self->{template}) {
1123 my $layout = new CFClient::Layout; 1317 my $layout = new CFClient::Layout;
1124 $layout->set_text (delete $self->{template}); 1318 $layout->set_text (delete $self->{template});
1125 $self->{template} = $layout; 1319 $self->{template} = $layout;
1126 } 1320 }
1127 1321
1128 $self->set_text (delete $self->{text}) if exists $self->{text}; 1322 if (exists $self->{markup}) {
1129 $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 }
1130 1327
1131 $self 1328 $self
1132} 1329}
1133 1330
1134sub escape_text { 1331sub escape($) {
1135 local $_ = $_[1]; 1332 local $_ = $_[0];
1136 1333
1137 s/&/&amp;/g; 1334 s/&/&amp;/g;
1138 s/>/&gt;/g; 1335 s/>/&gt;/g;
1139 s/</&lt;/g; 1336 s/</&lt;/g;
1140 1337
1141 $_[1] 1338 $_
1339}
1340
1341sub update {
1342 my ($self) = @_;
1343
1344 delete $self->{texture};
1345 $self->SUPER::update;
1142} 1346}
1143 1347
1144sub set_text { 1348sub set_text {
1145 my ($self, $text) = @_; 1349 my ($self, $text) = @_;
1146 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;
1147 $self->{layout}->set_text ($text); 1355 $self->{layout}->set_text ($text);
1148 1356
1149 delete $self->{texture}; 1357 $self->update;
1150 $self->check_size; 1358 $self->check_size;
1151 $self->update;
1152} 1359}
1153 1360
1154sub set_markup { 1361sub set_markup {
1155 my ($self, $markup) = @_; 1362 my ($self, $markup) = @_;
1156 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;
1157 $self->{layout}->set_markup ($markup); 1370 $self->{layout}->set_markup ($markup);
1158 1371
1159 delete $self->{texture}; 1372 $self->update;
1160 $self->check_size; 1373 $self->check_size;
1161 $self->update;
1162} 1374}
1163 1375
1164sub size_request { 1376sub size_request {
1165 my ($self) = @_; 1377 my ($self) = @_;
1166 1378
1167 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1379 $self->{layout}->set_font ($self->{font}) if $self->{font};
1168 $self->{layout}->set_width ($self->{max_w} || -1); 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});
1169 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1170 1384
1171 my ($w, $h) = $self->{layout}->size; 1385 my ($w, $h) = $self->{layout}->size;
1172 1386
1173 if (exists $self->{template}) { 1387 if (exists $self->{template}) {
… …
1195sub set_fontsize { 1409sub set_fontsize {
1196 my ($self, $fontsize) = @_; 1410 my ($self, $fontsize) = @_;
1197 1411
1198 $self->{fontsize} = $fontsize; 1412 $self->{fontsize} = $fontsize;
1199 delete $self->{texture}; 1413 delete $self->{texture};
1414
1415 $self->update;
1200 $self->check_size; 1416 $self->check_size;
1201 $self->update;
1202} 1417}
1203 1418
1204sub _draw { 1419sub _draw {
1205 my ($self) = @_; 1420 my ($self) = @_;
1206 1421
1422 $self->SUPER::_draw; # draw background, if applicable
1423
1207 my $tex = $self->{texture} ||= do { 1424 my $tex = $self->{texture} ||= do {
1425 $self->{layout}->set_foreground (@{$self->{fg}});
1208 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1209 $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});
1210 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431
1211 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
1212 }; 1443 };
1213 1444
1214 glEnable GL_BLEND;
1215 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1216 glEnable GL_TEXTURE_2D; 1445 glEnable GL_TEXTURE_2D;
1217 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1218 1447
1448 if ($tex->{format} == GL_ALPHA) {
1219 glColor @{$self->{fg}}; 1449 glColor @{$self->{fg}};
1220
1221 $self->{ox} = int (
1222 $self->{align} < 0 ? $self->{padding}
1223 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1224 : ($self->{w} - $tex->{w}) * 0.5
1225 );
1226
1227 $self->{oy} = int (
1228 $self->{valign} < 0 ? $self->{padding}
1229 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1230 : ($self->{h} - $tex->{h}) * 0.5
1231 );
1232
1233 $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 }
1234 1454
1235 glDisable GL_TEXTURE_2D; 1455 glDisable GL_TEXTURE_2D;
1236 glDisable GL_BLEND;
1237} 1456}
1238 1457
1239############################################################################# 1458#############################################################################
1240 1459
1241package CFClient::UI::EntryBase; 1460package CFClient::UI::EntryBase;
… …
1246 1465
1247sub new { 1466sub new {
1248 my $class = shift; 1467 my $class = shift;
1249 1468
1250 $class->SUPER::new ( 1469 $class->SUPER::new (
1251 fg => [1, 1, 1], 1470 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1471 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1472 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1473 active_fg => [0, 0, 0],
1255 can_hover => 1, 1474 can_hover => 1,
1256 can_focus => 1, 1475 can_focus => 1,
1257 valign => 0, 1476 valign => 0,
1258 can_events => 1, 1477 can_events => 1,
1259 @_ 1478 @_
1260 ) 1479 )
1261} 1480}
1262 1481
… …
1276 $self->{layout}->set_text ("$text "); 1495 $self->{layout}->set_text ("$text ");
1277 1496
1278 $self->emit (changed => $self->{text}); 1497 $self->emit (changed => $self->{text});
1279} 1498}
1280 1499
1281sub get_text {
1282 $_[0]{text}
1283}
1284
1285sub size_request {
1286 my ($self) = @_;
1287
1288 my ($w, $h) = $self->SUPER::size_request;
1289
1290 ($w + 1, $h) # add 1 for cursor
1291}
1292
1293sub size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1297}
1298
1299sub set_text { 1500sub set_text {
1300 my ($self, $text) = @_; 1501 my ($self, $text) = @_;
1301 1502
1302 $self->{cursor} = length $text; 1503 $self->{cursor} = length $text;
1303 $self->_set_text ($text); 1504 $self->_set_text ($text);
1304 $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
1305} 1525}
1306 1526
1307sub key_down { 1527sub key_down {
1308 my ($self, $ev) = @_; 1528 my ($self, $ev) = @_;
1309 1529
… …
1311 my $sym = $ev->{sym}; 1531 my $sym = $ev->{sym};
1312 my $uni = $ev->{unicode}; 1532 my $uni = $ev->{unicode};
1313 1533
1314 my $text = $self->get_text; 1534 my $text = $self->get_text;
1315 1535
1316 if ($sym == 8) { 1536 if ($uni == 8) {
1317 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1537 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1318 } elsif ($sym == 127) { 1538 } elsif ($uni == 127) {
1319 substr $text, $self->{cursor}, 1, ""; 1539 substr $text, $self->{cursor}, 1, "";
1320 } elsif ($sym == CFClient::SDLK_LEFT) { 1540 } elsif ($sym == CFClient::SDLK_LEFT) {
1321 --$self->{cursor} if $self->{cursor}; 1541 --$self->{cursor} if $self->{cursor};
1322 } elsif ($sym == CFClient::SDLK_RIGHT) { 1542 } elsif ($sym == CFClient::SDLK_RIGHT) {
1323 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1543 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1324 } elsif ($sym == CFClient::SDLK_HOME) { 1544 } elsif ($sym == CFClient::SDLK_HOME) {
1325 $self->{cursor} = 0; 1545 $self->{cursor} = 0;
1326 } elsif ($sym == CFClient::SDLK_END) { 1546 } elsif ($sym == CFClient::SDLK_END) {
1327 $self->{cursor} = length $text; 1547 $self->{cursor} = length $text;
1328 } elsif ($sym == 27) { 1548 } elsif ($uni == 27) {
1329 $self->emit ('escape'); 1549 $self->emit ('escape');
1330 } elsif ($uni) { 1550 } elsif ($uni) {
1331 substr $text, $self->{cursor}++, 0, chr $uni; 1551 substr $text, $self->{cursor}++, 0, chr $uni;
1332 } 1552 }
1333 1553
1334 $self->_set_text ($text); 1554 $self->_set_text ($text);
1335 $self->update; 1555 $self->update;
1556 $self->check_size;
1336} 1557}
1337 1558
1338sub focus_in { 1559sub focus_in {
1339 my ($self) = @_; 1560 my ($self) = @_;
1340 1561
… …
1416 my ($self, $ev) = @_; 1637 my ($self, $ev) = @_;
1417 1638
1418 my $sym = $ev->{sym}; 1639 my $sym = $ev->{sym};
1419 1640
1420 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} = '';
1421 $self->emit (activate => $self->get_text); 1646 $self->emit (activate => $txt);
1422 $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 }
1423 1670
1424 } else { 1671 } else {
1425 $self->SUPER::key_down ($ev); 1672 $self->SUPER::key_down ($ev);
1426 } 1673 }
1427 1674
… …
1441 1688
1442sub new { 1689sub new {
1443 my $class = shift; 1690 my $class = shift;
1444 1691
1445 $class->SUPER::new ( 1692 $class->SUPER::new (
1446 padding => 4, 1693 padding => 4,
1447 fg => [1, 1, 1], 1694 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1695 active_fg => [0, 0, 1],
1450 can_hover => 1, 1696 can_hover => 1,
1451 align => 0, 1697 align => 0,
1452 valign => 0, 1698 valign => 0,
1453 can_events => 1, 1699 can_events => 1,
1454 @_ 1700 @_
1455 ) 1701 )
1456} 1702}
1457 1703
… …
1471 1717
1472 if ($GRAB == $self) { 1718 if ($GRAB == $self) {
1473 $self->{fg} = $self->{active_fg}; 1719 $self->{fg} = $self->{active_fg};
1474 } 1720 }
1475 1721
1476 glEnable GL_BLEND;
1477 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1478 glEnable GL_TEXTURE_2D; 1722 glEnable GL_TEXTURE_2D;
1479 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1480 glColor 0, 0, 0, 1; 1724 glColor 0, 0, 0, 1;
1481 1725
1482 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1726 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1483 1727
1484 glDisable GL_TEXTURE_2D; 1728 glDisable GL_TEXTURE_2D;
1485 glDisable GL_BLEND;
1486 1729
1487 $self->SUPER::_draw; 1730 $self->SUPER::_draw;
1488} 1731}
1489 1732
1490############################################################################# 1733#############################################################################
… …
1504 1747
1505 $class->SUPER::new ( 1748 $class->SUPER::new (
1506 padding => 2, 1749 padding => 2,
1507 fg => [1, 1, 1], 1750 fg => [1, 1, 1],
1508 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],
1509 state => 0, 1754 state => 0,
1510 can_hover => 1, 1755 can_hover => 1,
1511 @_ 1756 @_
1512 ) 1757 )
1513} 1758}
… …
1537 1782
1538 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;
1539 1784
1540 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1541 1786
1542 glEnable GL_BLEND; 1787 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788
1543 glEnable GL_TEXTURE_2D; 1789 glEnable GL_TEXTURE_2D;
1544 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1545
1546 my $tex = $self->{state} ? $tex[1] : $tex[0];
1547
1548 $tex->draw_quad (0, 0, $s, $s); 1790 $tex->draw_quad_alpha (0, 0, $s, $s);
1549
1550 glDisable GL_TEXTURE_2D; 1791 glDisable GL_TEXTURE_2D;
1551 glDisable GL_BLEND;
1552} 1792}
1553 1793
1554############################################################################# 1794#############################################################################
1555 1795
1556package CFClient::UI::Image; 1796package CFClient::UI::Image;
… …
1599 glTranslate 0, -$self->{w}, 0; 1839 glTranslate 0, -$self->{w}, 0;
1600 1840
1601 ($w, $h) = ($h, $w); 1841 ($w, $h) = ($h, $w);
1602 } 1842 }
1603 1843
1604 glEnable GL_BLEND;
1605 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1606 glEnable GL_TEXTURE_2D; 1844 glEnable GL_TEXTURE_2D;
1607 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1845 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1608 1846
1609 $tex->draw_quad (0, 0, $w, $h); 1847 $tex->draw_quad_alpha (0, 0, $w, $h);
1610 1848
1611 glDisable GL_BLEND;
1612 glDisable GL_TEXTURE_2D; 1849 glDisable GL_TEXTURE_2D;
1613} 1850}
1614 1851
1615############################################################################# 1852#############################################################################
1616 1853
1617package CFClient::UI::VGauge; 1854package CFClient::UI::VGauge;
1618 1855
1619our @ISA = CFClient::UI::Base::; 1856our @ISA = CFClient::UI::Base::;
1857
1858use List::Util qw(min max);
1620 1859
1621use CFClient::OpenGL; 1860use CFClient::OpenGL;
1622 1861
1623my %tex = ( 1862my %tex = (
1624 food => [ 1863 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1864 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1865 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 1866 ],
1628 grace => [ 1867 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1868 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 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/
1631 ], 1870 ],
1632 hp => [ 1871 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1872 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1873 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 1874 ],
1636 mana => [ 1875 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1876 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 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/
1639 ], 1878 ],
1640); 1879);
1641 1880
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 1881# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 1882sub new {
… …
1662} 1901}
1663 1902
1664sub set_max { 1903sub set_max {
1665 my ($self, $max) = @_; 1904 my ($self, $max) = @_;
1666 1905
1906 return if $self->{max_val} == $max;
1907
1667 $self->{max_val} = $max; 1908 $self->{max_val} = $max;
1909 $self->update;
1668} 1910}
1669 1911
1670sub set_value { 1912sub set_value {
1671 my ($self, $val, $max) = @_; 1913 my ($self, $val, $max) = @_;
1672 1914
1673 $self->set_max ($max) 1915 $self->set_max ($max)
1674 if defined $max; 1916 if defined $max;
1675 1917
1676 $max = $self->{max_val}; 1918 return if $self->{val} == $val;
1919
1677 $self->{val} = $val; 1920 $self->{val} = $val;
1678
1679 $self->update; 1921 $self->update;
1680} 1922}
1681 1923
1682sub _draw { 1924sub _draw {
1683 my ($self) = @_; 1925 my ($self) = @_;
1684 1926
1685 my $tex = $tex{$self->{type}}; 1927 my $tex = $tex{$self->{type}};
1928 my ($t1, $t2, $t3) = @$tex;
1686 1929
1687 my ($w, $h) = ($self->{w}, $self->{h}); 1930 my ($w, $h) = ($self->{w}, $self->{h});
1688 1931
1689 if ($self->{vertical}) { 1932 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 1933 glRotate 90, 0, 0, 1;
… …
1692 1935
1693 ($w, $h) = ($h, $w); 1936 ($w, $h) = ($h, $w);
1694 } 1937 }
1695 1938
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 1939 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 1940
1699 my $t1 = $tex->[0]; 1941 my $ycut1 = max 0, min 1, $ycut;
1700 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);
1701 1946
1702 glEnable GL_BLEND; 1947 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1948 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 1949 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1950 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 1951
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1952 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 1953 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 1954 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1955 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1956 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1957 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 1958 glEnd;
1717 1959
1960 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1961 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 1962 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1963 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1964 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1965 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1966 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 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 }
1725 1978
1726 glDisable GL_BLEND; 1979 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 1980 glDisable GL_TEXTURE_2D;
1728} 1981}
1729 1982
… …
1735 1988
1736sub new { 1989sub new {
1737 my ($class, %arg) = @_; 1990 my ($class, %arg) = @_;
1738 1991
1739 my $self = $class->SUPER::new ( 1992 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 1993 tooltip => $arg{type},
1994 can_hover => 1,
1995 can_events => 1,
1741 %arg, 1996 %arg,
1742 ); 1997 );
1743 1998
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1999 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1745 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 2000 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1746 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 2001 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 2002
1748 $self 2003 $self
1749} 2004}
1750 2005
1751sub set_fontsize { 2006sub set_fontsize {
… …
1753 2008
1754 $self->{value}->set_fontsize ($fsize); 2009 $self->{value}->set_fontsize ($fsize);
1755 $self->{max} ->set_fontsize ($fsize); 2010 $self->{max} ->set_fontsize ($fsize);
1756} 2011}
1757 2012
2013sub set_max {
2014 my ($self, $max) = @_;
2015
2016 $self->{gauge}->set_max ($max);
2017 $self->{max}->set_text ($max);
2018}
2019
1758sub set_value { 2020sub set_value {
1759 my ($self, $val, $max) = @_; 2021 my ($self, $val, $max) = @_;
1760 2022
1761 $self->set_max ($max) 2023 $self->set_max ($max)
1762 if defined $max; 2024 if defined $max;
1763 2025
1764 $self->{gauge}->set_value ($val, $max); 2026 $self->{gauge}->set_value ($val, $max);
1765 $self->{value}->set_text ($val); 2027 $self->{value}->set_text ($val);
1766}
1767
1768sub set_max {
1769 my ($self, $max) = @_;
1770
1771 $self->{gauge}->set_max ($max);
1772 $self->{max}->set_text ($max);
1773} 2028}
1774 2029
1775############################################################################# 2030#############################################################################
1776 2031
1777package CFClient::UI::Slider; 2032package CFClient::UI::Slider;
… …
1787 qw(s1_slider.png s1_slider_bg.png); 2042 qw(s1_slider.png s1_slider_bg.png);
1788 2043
1789sub new { 2044sub new {
1790 my $class = shift; 2045 my $class = shift;
1791 2046
1792 # range [value, low, high, page] 2047 # range [value, low, high, page, unit]
1793 2048
1794 # TODO: 0-width page 2049 # TODO: 0-width page
1795 # TODO: req_w/h are wrong with vertical 2050 # TODO: req_w/h are wrong with vertical
1796 # TODO: calculations are off 2051 # TODO: calculations are off
1797 my $self = $class->SUPER::new ( 2052 my $self = $class->SUPER::new (
1798 fg => [1, 1, 1], 2053 fg => [1, 1, 1],
1799 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],
1800 range => [0, 0, 100, 10], 2057 range => [0, 0, 100, 10],
1801 req_w => 20, 2058 req_w => $::WIDTH / 80,
1802 req_h => 20, 2059 req_h => $::WIDTH / 80,
1803 vertical => 0, 2060 vertical => 0,
1804 can_hover => 1, 2061 can_hover => 1,
1805 inner_pad => 5, 2062 inner_pad => .05,
1806 @_ 2063 @_
1807 ); 2064 );
1808 2065
2066 $self->set_value ($self->{range}[0]);
2067 $self->update;
2068
1809 $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 }
1810} 2093}
1811 2094
1812sub size_request { 2095sub size_request {
1813 my ($self) = @_; 2096 my ($self) = @_;
1814 2097
… …
1827 2110
1828sub mouse_motion { 2111sub mouse_motion {
1829 my ($self, $ev, $x, $y) = @_; 2112 my ($self, $ev, $x, $y) = @_;
1830 2113
1831 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
1832 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2131 my ($value, $lo, $hi, $page) = @{$self->{range}};
1833 2132
1834 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2133 my $inner_w = 1 - 2 * $self->{inner_pad};
1835 2134
1836 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1837 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1838 2136
1839 $x -= $inner_pad_px; # substract the padding 2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1840 $x = $x * ($hi - $lo) / $inner_w + $lo; 2138 $value = $self->{scale} * ($value - $lo);
1841 $x = $lo if $x < $lo;
1842 $x = $hi - $page if $x > $hi - $page;
1843 $self->{range}[0] = $x;
1844 2139
1845 $self->emit (changed => $x); 2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
1846 $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;
1847 } 2147 });
1848}
1849 2148
1850# the inner_* stuff is for generating a padding for the slider handle, 2149 $self->SUPER::update;
1851# so that the handle doesn't leave the texture. This calculation isn't 100%
1852# correct propably, but it does the job for now
1853sub _calc_inner_pad_px {
1854 my ($self, $w) = @_;
1855 ($w / 100) * $self->{inner_pad} # % to pixels
1856} 2150}
1857 2151
1858sub _draw { 2152sub _draw {
1859 my ($self) = @_; 2153 my ($self) = @_;
1860 2154
1861 $self->SUPER::_draw (); 2155 $self->SUPER::_draw ();
1862 2156
1863 my ($w, $h) = @$self{qw(w h)}; 2157 glScale $self->{w}, $self->{h};
1864 2158
1865 if ($self->{vertical}) { 2159 if ($self->{vertical}) {
1866 # draw a vertical slider like a rotated horizontal slider 2160 # draw a vertical slider like a rotated horizontal slider
1867 2161
2162 glTranslate 1, 0, 0;
1868 glRotate 90, 0, 0, 1; 2163 glRotate 90, 0, 0, 1;
1869 glTranslate 0, -$self->{w}, 0;
1870
1871 ($w, $h) = ($h, $w);
1872 } 2164 }
1873 2165
1874 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1875 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1876 2168
1877 my ($value, $lo, $hi, $page) = @{$self->{range}};
1878
1879 $hi = $value + 1 if $lo == $hi;
1880
1881 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1882 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1883
1884 $page = int $page * $inner_w / ($hi - $lo);
1885 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1886
1887 $w -= $page;
1888 $page &= ~1;
1889 glTranslate $page * 0.5, 0, 0;
1890 $page ||= 2;
1891
1892 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1893 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1894
1895 glEnable GL_BLEND;
1896 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1897 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
1898 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1899 2171
1900 # draw background 2172 # draw background
1901 $tex[1]->draw_quad (0, 0, $w, $h); 2173 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1902 2174
1903 # draw handle 2175 # draw handle
1904 $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);
1905 2177
1906 glDisable GL_BLEND;
1907 glDisable GL_TEXTURE_2D; 2178 glDisable GL_TEXTURE_2D;
1908} 2179}
1909 2180
1910############################################################################# 2181#############################################################################
1911 2182
… …
1917 2188
1918sub new { 2189sub new {
1919 my $class = shift; 2190 my $class = shift;
1920 2191
1921 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
1922 fontsize => 1, 2193 fontsize => 1,
2194 can_events => 0,
1923 #font => default_font 2195 #font => default_font
1924 @_, 2196 @_,
1925 2197
1926 layout => (new CFClient::Layout), 2198 layout => (new CFClient::Layout 1),
1927 par => [], 2199 par => [],
1928 height => 0, 2200 height => 0,
1929 children => [ 2201 children => [
1930 (new CFClient::UI::Empty expand => 1), 2202 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 2203 (new CFClient::UI::Slider vertical => 1),
1932 ], 2204 ],
1933 ); 2205 );
1934 2206
1935 $self->{children}[1]->connect (changed => sub { 2207 $self->{children}[1]->connect (changed => sub { $self->update });
1936 $self->update;
1937 });
1938 2208
1939 $self 2209 $self
1940} 2210}
1941 2211
1942sub set_fontsize { 2212sub set_fontsize {
… …
1950 my ($self, $text) = @_; 2220 my ($self, $text) = @_;
1951 2221
1952 my $layout = $self->{layout}; 2222 my $layout = $self->{layout};
1953 2223
1954 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $layout->set_width ($self->{w}); 2225 $layout->set_width ($self->{children}[0]{w});
1956 $layout->set_text ($text); 2226 $layout->set_markup ($text);
1957 2227
1958 ($layout->size)[1] 2228 ($layout->size)[1]
1959} 2229}
1960 2230
1961sub reflow { 2231sub reflow {
… …
1999 2269
2000 return unless $self->{h} > 0; 2270 return unless $self->{h} > 0;
2001 2271
2002 delete $self->{texture}; 2272 delete $self->{texture};
2003 2273
2004 $ROOT->on_refresh ($self, sub { 2274 $ROOT->on_post_alloc ($self, sub {
2005 if (delete $self->{need_reflow}) { 2275 if (delete $self->{need_reflow}) {
2006 my $height = 0; 2276 my $height = 0;
2007 2277
2008 $height += $_->[0] = $self->text_height ($_->[2]) 2278 $height += $_->[0] = $self->text_height ($_->[2])
2009 for @{$self->{par}}; 2279 for @{$self->{par}};
… …
2013 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2014 2284
2015 delete $self->{texture}; 2285 delete $self->{texture};
2016 } 2286 }
2017 2287
2018 $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 {
2019 glClearColor 0, 0, 0, 1; 2289 glClearColor 0, 0, 0, 0;
2020 glClear GL_COLOR_BUFFER_BIT; 2290 glClear GL_COLOR_BUFFER_BIT;
2021 2291
2022 glEnable GL_BLEND;
2023 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2024 glEnable GL_TEXTURE_2D; 2292 glEnable GL_TEXTURE_2D;
2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2026 2294
2027 my $top = int $self->{children}[1]{range}[0]; 2295 my $top = int $self->{children}[1]{range}[0];
2028 2296
… …
2037 2305
2038 for my $par (@{$self->{par}}) { 2306 for my $par (@{$self->{par}}) {
2039 my $h = $par->[0]; 2307 my $h = $par->[0];
2040 2308
2041 if ($y0 < $y + $h && $y < $y1) { 2309 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] });
2042 $layout->set_text ($par->[2]); 2311 $layout->set_markup ($par->[2]);
2043 2312
2044 glColor @{ $par->[1] };
2045 my ($W, $H) = $layout->size; 2313 my ($W, $H) = $layout->size;
2046 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);
2047 } 2315 }
2048 2316
2049 $y += $h; 2317 $y += $h;
2050 } 2318 }
2051 2319
2052 glDisable GL_TEXTURE_2D; 2320 glDisable GL_TEXTURE_2D;
2053 glDisable GL_BLEND;
2054 }; 2321 };
2055 }); 2322 });
2056} 2323}
2057 2324
2058sub _draw { 2325sub _draw {
2059 my ($self) = @_; 2326 my ($self) = @_;
2060 2327
2061 if ($self->{texture}) {
2062 glEnable GL_TEXTURE_2D; 2328 glEnable GL_TEXTURE_2D;
2063 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2064 $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});
2065 glDisable GL_TEXTURE_2D; 2332 glDisable GL_TEXTURE_2D;
2066 }
2067 2333
2068 $self->{children}[1]->draw; 2334 $self->{children}[1]->draw;
2069 2335
2070} 2336}
2071 2337
… …
2119 2385
2120sub new { 2386sub new {
2121 my $class = shift; 2387 my $class = shift;
2122 2388
2123 my $self = $class->SUPER::new ( 2389 my $self = $class->SUPER::new (
2124 state => 0, 2390 state => 0,
2125 connect_activate => \&toggle_flopper, 2391 connect_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2392 @_
2128 ); 2393 );
2129 2394
2130 if ($self->{state}) { 2395 if ($self->{state}) {
2131 $self->{state} = 0; 2396 $self->{state} = 0;
… …
2166 @_, 2431 @_,
2167 can_events => 0, 2432 can_events => 0,
2168 ) 2433 )
2169} 2434}
2170 2435
2171sub set_text { 2436sub set_tooltip_from {
2172 my ($self, $text) = @_; 2437 my ($self, $widget) = @_;
2173 2438
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2439 $self->add (new CFClient::UI::Label
2175 $self->{label}->set_text ($text); 2440 markup => $widget->{tooltip},
2176 $self->add ($self->{label}); 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 );
2177} 2447}
2178 2448
2179sub size_request { 2449sub size_request {
2180 my ($self) = @_; 2450 my ($self) = @_;
2181 2451
2182 $self->child->set_max_size ($::WIDTH * 0.2);
2183
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2452 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2453
2186 ($w + 4, $h + 4) 2454 ($w + 4, $h + 4)
2187} 2455}
2188 2456
2457sub size_allocate {
2458 my ($self, $w, $h) = @_;
2459
2460 $self->SUPER::size_allocate ($w - 4, $h - 4);
2461}
2462
2189sub _draw { 2463sub _draw {
2190 my ($self) = @_; 2464 my ($self) = @_;
2191 2465
2192 glPushMatrix;
2193 glTranslate 0.375, 0.375; 2466 glTranslate 0.375, 0.375;
2194 2467
2195 my ($w, $h) = @$self{qw(w h)}; 2468 my ($w, $h) = @$self{qw(w h)};
2196 2469
2197 glColor 1, 0.8, 0.4; 2470 glColor 1, 0.8, 0.4;
… …
2208 glVertex 0 , $h; 2481 glVertex 0 , $h;
2209 glVertex $w, $h; 2482 glVertex $w, $h;
2210 glVertex $w, 0; 2483 glVertex $w, 0;
2211 glEnd; 2484 glEnd;
2212 2485
2213 glPopMatrix; 2486 glTranslate 2 - 0.375, 2 - 0.375;
2214
2215 glTranslate 2, 2;
2216 $self->SUPER::_draw; 2487 $self->SUPER::_draw;
2217} 2488}
2218 2489
2219############################################################################# 2490#############################################################################
2220 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
2221package CFClient::UI::Root; 2859package CFClient::UI::Root;
2222 2860
2223our @ISA = CFClient::UI::Container::; 2861our @ISA = CFClient::UI::Container::;
2224 2862
2225use CFClient::OpenGL; 2863use CFClient::OpenGL;
2226 2864
2227sub check_size { 2865sub new {
2228 my ($self) = @_; 2866 my $class = shift;
2229 2867
2230 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2868 $class->SUPER::new (
2231} 2869 @_,
2232 2870 )
2233sub size_request {
2234 ($::WIDTH, $::HEIGHT)
2235} 2871}
2236 2872
2237sub configure { 2873sub configure {
2238 my ($self, $x, $y, $w, $h) = @_; 2874 my ($self, $x, $y, $w, $h) = @_;
2239 2875
2240 $self->SUPER::configure ($x, $y, $w, $h); 2876 $self->{w} = $w;
2877 $self->{h} = $h;
2878}
2241 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
2242 for my $child (@{$self->{children}}) { 2902 for my $child ($self->children) {
2243 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)};
2244 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
2245 $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;
2246 $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
2247 $child->configure ($X, $Y, $W,$H); 2914 $child->configure ($X, $Y, $W, $H);
2248 } 2915 }
2249} 2916}
2250 2917
2251sub _topleft { 2918sub coord2local {
2252 my ($self, $x, $y) = @_; 2919 my ($self, $x, $y) = @_;
2253 2920
2254 ($x, $y) 2921 ($x, $y)
2255} 2922}
2256 2923
2924sub coord2global {
2925 my ($self, $x, $y) = @_;
2926
2927 ($x, $y)
2928}
2929
2257sub update { 2930sub update {
2258 my ($self) = @_; 2931 my ($self) = @_;
2259 2932
2260 $self->check_size; 2933 $self->check_size;
2261 ::refresh (); 2934 $::WANT_REFRESH++;
2262} 2935}
2263 2936
2264sub add { 2937sub add {
2265 my ($self, $child) = @_; 2938 my ($self, @children) = @_;
2266 2939
2940 for my $child (@children) {
2941 $child->{toplevel} = 1;
2942
2267 # integerize window positions 2943 # integerise window positions
2268 $child->{x} = int $child->{x}; 2944 $child->{x} = int $child->{x};
2269 $child->{y} = int $child->{y}; 2945 $child->{y} = int $child->{y};
2946 }
2270 2947
2271 $self->SUPER::add ($child); 2948 $self->SUPER::add (@children);
2272} 2949}
2273 2950
2274sub on_refresh { 2951sub on_refresh {
2275 my ($self, $id, $cb) = @_; 2952 my ($self, $id, $cb) = @_;
2276 2953
2277 $self->{refresh_hook}{$id} = $cb; 2954 $self->{refresh_hook}{$id} = $cb;
2278} 2955}
2279 2956
2957sub on_post_alloc {
2958 my ($self, $id, $cb) = @_;
2959
2960 $self->{post_alloc_hook}{$id} = $cb;
2961}
2962
2280sub draw { 2963sub draw {
2281 my ($self) = @_; 2964 my ($self) = @_;
2282 2965
2283 while (my $rcb = delete $self->{refresh_hook}) { 2966 while ($self->{refresh_hook}) {
2284 $_->() 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}};
2285 } 3019 }
2286 3020
2287 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3021 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2288 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2289 glClear GL_COLOR_BUFFER_BIT; 3023 glClear GL_COLOR_BUFFER_BIT;
… …
2300############################################################################# 3034#############################################################################
2301 3035
2302package CFClient::UI; 3036package CFClient::UI;
2303 3037
2304$ROOT = new CFClient::UI::Root; 3038$ROOT = new CFClient::UI::Root;
2305$TOOLTIP = new CFClient::UI::Tooltip; 3039$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2306 3040
23071 30411
2308 3042

Diff Legend

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