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.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $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;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
152sub rescale_widgets { 171sub rescale_widgets {
153 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
154 173
155 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
165 } 189 }
166 } 190 }
167 191
168 reconfigure_widgets; 192 reconfigure_widgets;
169} 193}
… …
178 202
179sub new { 203sub new {
180 my $class = shift; 204 my $class = shift;
181 205
182 my $self = bless { 206 my $self = bless {
183 x => 0, 207 x => "center",
184 y => 0, 208 y => "center",
185 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
186 can_events => 1, 212 can_events => 1,
187 @_ 213 @_
188 }, $class; 214 }, $class;
189 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
190 for (keys %$self) { 218 for (keys %$self) {
191 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
193 } 221 }
194 } 222 }
195 223
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
197 235
198 $self 236 $self
199} 237}
200 238
201sub destroy { 239sub destroy {
… …
205 %$self = (); 243 %$self = ();
206} 244}
207 245
208sub show { 246sub show {
209 my ($self) = @_; 247 my ($self) = @_;
248
210 return if $self->{parent}; 249 return if $self->{parent};
211 250
212 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
213} 252}
214 253
215sub show_centered { 254sub set_visible {
216 my ($self) = @_; 255 my ($self) = @_;
256
217 return if $self->{parent}; 257 return if $self->{visible};
218 258
219 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
220 261
221 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 263
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
224 }, 265
225 ); 266 $_->set_visible for $self->children;
226} 267}
227 268
228sub set_invisible { 269sub set_invisible {
229 my ($self) = @_; 270 my ($self) = @_;
230 271
231 # broken show/hide model 272 return unless $self->{visible};
232 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
233 delete $self->{visible}; 277 delete $self->{visible};
234 278
235 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
237 281
238 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
240 284
241 $self->focus_out; 285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
… …
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
276 339
277sub configure { 340sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
279 342
280 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
283 348
284 # use alignment to adjust x, y 349 # use alignment to adjust x, y
285 350
286 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 353 }
291 354
292 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 356 $self->{x} = $x;
294 $self->{y} = $y; 357 $self->{y} = $y;
295 $self->update; 358 $self->update;
296 } 359 }
297 360
298 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
300 } 368 }
301} 369}
302 370
303sub size_allocate { 371sub size_allocate {
304 # nothing to be done 372 # nothing to be done
305} 373}
306 374
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
315} 381}
316 382
317sub set_max_size { 383sub set_max_size {
318 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
319 385
… …
378 444
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 446 unless $FOCUS;
381} 447}
382 448
383sub mouse_motion { } 449sub mouse_motion { 0 }
384sub button_up { } 450sub button_up { 0 }
385sub key_down { } 451sub key_down { 0 }
386sub key_up { } 452sub key_up { 0 }
387 453
388sub button_down { 454sub button_down {
389 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
390 456
391 $self->focus_in; 457 $self->focus_in;
392}
393 458
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399 535
400sub draw { 536sub draw {
401 my ($self) = @_; 537 my ($self) = @_;
402 538
403 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 550
405 glPushMatrix; 551 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 553
410 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 556 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 558 glBegin GL_QUADS;
417 glVertex $x , $y; 559 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
421 glEnd; 563 glEnd;
422 glDisable GL_BLEND; 564 glDisable GL_BLEND;
423 } 565 }
424 566
425 if ($ENV{PCLIENT_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 568 glPushMatrix;
427 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 572 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
434 glEnd; 576 glEnd;
435 glPopMatrix; 577 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
438} 583}
439 584
440sub _draw { 585sub _draw {
441 my ($self) = @_; 586 my ($self) = @_;
442 587
443 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
444}
445
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
471}
472
473sub check_size {
474 my ($self, $forced) = @_;
475
476 $self->{force_alloc} = 1 if $forced;
477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
478}
479
480sub update {
481 my ($self) = @_;
482
483 $self->{parent}->update
484 if $self->{parent};
485}
486
487sub connect {
488 my ($self, $signal, $cb) = @_;
489
490 push @{ $self->{signal_cb}{$signal} }, $cb;
491}
492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
504} 589}
505 590
506sub DESTROY { 591sub DESTROY {
507 my ($self) = @_; 592 my ($self) = @_;
508 593
… …
540 625
541 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
542 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
543 628
544 glEnable GL_BLEND; 629 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glColor @$color; 631 glColor_premultiply @$color;
547 632
548 glBegin GL_QUADS; 633 glBegin GL_QUADS;
549 glVertex 0 , 0; 634 glVertex 0 , 0;
550 glVertex 0 , $h; 635 glVertex 0 , $h;
551 glVertex $w, $h; 636 glVertex $w, $h;
… …
566 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
568} 653}
569 654
570sub size_request { 655sub size_request {
571 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
572} 659}
573 660
574sub draw { } 661sub draw { }
575 662
576############################################################################# 663#############################################################################
… …
580our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
581 668
582sub new { 669sub new {
583 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
584 671
585 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
586 673
587 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
588 children => [], 675 children => [],
589 can_events => 0, 676 can_events => 0,
590 %arg, 677 %arg,
591 ); 678 );
679
592 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
593 682
594 $self 683 $self
595} 684}
596 685
597sub add { 686sub add {
… …
605 $self->{children} = [ 694 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
608 ]; 697 ];
609 698
610 $self->check_size (1); 699 $self->realloc;
611 $self->update;
612} 700}
613 701
614sub children { 702sub children {
615 @{ $_[0]{children} } 703 @{ $_[0]{children} }
616} 704}
… …
621 delete $child->{parent}; 709 delete $child->{parent};
622 $child->hide; 710 $child->hide;
623 711
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 713
626 $self->check_size (1); 714 $self->realloc;
627 $self->update;
628} 715}
629 716
630sub clear { 717sub clear {
631 my ($self) = @_; 718 my ($self) = @_;
632 719
… …
636 for (@$children) { 723 for (@$children) {
637 delete $_->{parent}; 724 delete $_->{parent};
638 $_->hide; 725 $_->hide;
639 } 726 }
640 727
641 $self->check_size; 728 $self->realloc;
642 $self->update;
643} 729}
644 730
645sub find_widget { 731sub find_widget {
646 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
647 733
648 $x -= $self->{x}; 734 $x -= $self->{x};
649 $y -= $self->{y}; 735 $y -= $self->{y};
650 736
651 my $res; 737 my $res;
652 738
653 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
654 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
655 and return $res; 741 and return $res;
656 } 742 }
657 743
658 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
707 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
708} 794}
709 795
710############################################################################# 796#############################################################################
711 797
798# back-buffered drawing area
799
712package CFClient::UI::Window; 800package CFClient::UI::Window;
713 801
714our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
715 803
716use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
734 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
735 $self->update; 823 $self->update;
736} 824}
737 825
738sub _render { 826sub _render {
827 my ($self) = @_;
828
739 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
740} 830}
741 831
742sub render_child { 832sub render_child {
743 my ($self) = @_; 833 my ($self) = @_;
744 834
745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
746 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
747 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
748 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
749 $self->_render; 846 $self->_render;
750 }; 847 };
751} 848}
752 849
753sub _draw { 850sub _draw {
754 my ($self) = @_; 851 my ($self) = @_;
755 852
756 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
757 854
758 my $tex = $self->{texture} 855 my $tex = $self->{texture}
759 or return; 856 or return;
760 857
761 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
763 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
764 863
765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad (0, 0, $w, $h);
766 865
866 glDisable GL_BLEND;
767 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
768} 868}
769 869
770############################################################################# 870#############################################################################
771 871
… …
784} 884}
785 885
786sub size_request { 886sub size_request {
787 my ($self) = @_; 887 my ($self) = @_;
788 888
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790 890
791 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
792} 895}
793 896
794sub size_allocate { 897sub size_allocate {
795 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
796 899
900 my $child = $self->child;
901
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799 904
800 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
801 $self->update; 906 $self->update;
802} 907}
803 908
… …
839} 944}
840 945
841sub _render { 946sub _render {
842 my ($self) = @_; 947 my ($self) = @_;
843 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
844 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845 953
846 $self->SUPER::_render; 954 $self->SUPER::_render;
847} 955}
848 956
… …
851package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
852 960
853our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
854 962
855sub new { 963sub new {
856 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
857 967
858 my $self; 968 my $self;
859 969
860 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
861 vertical => 1, 971 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 973 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 974 $self->{vp}->set_offset (0, $_[1]);
865 }, 975 },
866 ; 976 ;
867 977
868 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
869 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
870 slider => $slider, 980 slider => $slider,
871 @_, 981 %arg,
872 ); 982 );
873 983
874 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp});
876 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
877 986
878 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
879} 994}
880 995
881sub update { 996sub update {
882 my ($self) = @_; 997 my ($self) = @_;
883 998
… …
922 1037
923 if ($self->{bg}) { 1038 if ($self->{bg}) {
924 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
925 1040
926 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
927 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
928 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
929 1044
930 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
931 glVertex 0 , 0; 1046 glVertex 0 , 0;
932 glVertex 0 , $h; 1047 glVertex 0 , $h;
933 glVertex $w, $h; 1048 glVertex $w, $h;
… …
946 1061
947our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
948 1063
949use CFClient::OpenGL; 1064use CFClient::OpenGL;
950 1065
951my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
953 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
954 1073
955sub new { 1074sub new {
956 my $class = shift; 1075 my ($class, %arg) = @_;
957 1076
958 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
959 1078
960 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
961 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
962 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
963 border => 0.6, 1082 border => 0.6,
964 is_toplevel => 1,
965 can_events => 1, 1083 can_events => 1,
966 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
967 ); 1087 );
968 1088
969 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
970 align => 0, 1090 align => 0,
971 valign => 1, 1091 valign => 1,
972 text => $self->{title}, 1092 text => $title,
973 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
974 1095
975 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
976} 1104}
977 1105
978sub border { 1106sub border {
979 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
980} 1108}
981 1109
982sub size_request { 1110sub size_request {
983 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
984 1115
985 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
986 1117
987 ( 1118 (
988 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
991} 1122}
992 1123
993sub size_allocate { 1124sub size_allocate {
994 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
995 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
996 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
997 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
998 1137
999 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1000 if $self->{title};
1001
1002 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1003} 1139}
1004 1140
1005sub button_down { 1141sub button_down {
1006 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1007 1143
… …
1023 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1024 1160
1025 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1026 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1027 1163
1028 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1029 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
1030 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1031 $self->check_size; 1168 $self->realloc;
1032 }; 1169 };
1033 1170
1034 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1035 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1036 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1038 $self->{motion} = sub { 1175 $self->{motion} = sub {
1039 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1040 1177
1041 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1042 1179
1043 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1044 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1045 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1046 } 1188 1
1047} 1189}
1048 1190
1049sub button_up { 1191sub button_up {
1050 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1051 1193
1052 delete $self->{motion}; 1194 !!delete $self->{motion}
1053} 1195}
1054 1196
1055sub mouse_motion { 1197sub mouse_motion {
1056 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1057 1199
1058 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1059} 1203}
1060 1204
1061sub _draw { 1205sub _draw {
1062 my ($self) = @_; 1206 my ($self) = @_;
1063 1207
1208 my $child = $self->{children}[0];
1209
1064 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1065 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1066 1212
1067 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1069 1215
1070 my $border = $self->border; 1216 my $border = $self->border;
1071 1217
1072 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1073 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1074 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1075 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1076 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1077 1223
1078 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1079 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1080 1226
1081 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1082 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1083 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1084
1085 glColor @{ $self->{bg} };
1086
1087 $bg->{s} = $rep_x;
1088 $bg->{t} = $rep_y;
1089 $bg->{wrap_mode} = 1;
1090 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1091 } 1232 }
1092 1233
1093 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1094 1235
1095 $self->{title}->draw if $self->{title};
1096
1097 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1098} 1242}
1099 1243
1100############################################################################# 1244#############################################################################
1101 1245
1102package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1124 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1125 1269
1126 $child->set_parent ($self); 1270 $child->set_parent ($self);
1127 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1128 1272
1129 $self->check_size (1); 1273 $self->realloc;
1130} 1274}
1131 1275
1132# TODO: move to container class maybe? send children a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1133sub clear { 1277sub clear {
1134 my ($self) = @_; 1278 my ($self) = @_;
… …
1139 for (@children) { 1283 for (@children) {
1140 delete $_->{parent}; 1284 delete $_->{parent};
1141 $_->hide; 1285 $_->hide;
1142 } 1286 }
1143 1287
1144 $self->check_size (1); 1288 $self->realloc;
1145 $self->update;
1146} 1289}
1147 1290
1148sub get_wh { 1291sub get_wh {
1149 my ($self) = @_; 1292 my ($self) = @_;
1150 1293
… …
1246 } 1389 }
1247} 1390}
1248 1391
1249############################################################################# 1392#############################################################################
1250 1393
1251package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1252
1253# TODO: wrap into common Box base class
1254 1395
1255our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1256 1397
1257sub size_request { 1398sub size_request {
1258 my ($self) = @_; 1399 my ($self) = @_;
1259 1400
1260 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1261 1402 ? (
1262 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1263 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1264 (List::Util::max map $_->[1], @alloc), 1405 )
1265 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1266} 1410}
1267 1411
1268sub size_allocate { 1412sub size_allocate {
1269 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1270 1414
1271 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1272
1273 my $children = $self->{children}; 1416 my $children = $self->{children};
1274 1417
1275 my @h = map $_->{req_w}, @$children; 1418 my @req;
1276 1419
1277 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1278 1421 @req = ($space / (@$children || 1)) x @$children;
1279 if ($req_h > $h) {
1280 # ah well, not enough space
1281 $_ *= $h / $req_h for @h;
1282 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1283 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1284 $exp ||= 1;
1285 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1286 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1287 my $child = $children->[$_];
1288
1289 my $alloc_h = $h[$_];
1290 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1291 $h[$_] = $alloc_h;
1292 } 1436 }
1293 } 1437 }
1294 1438
1295 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1296 1440
1297 my $y = 0; 1441 my $pos = 0;
1298 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1299 my $child = $children->[$_];
1300 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1301 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1302 1445
1303 $y += $h; 1446 $pos += $alloc;
1304 } 1447 }
1305 1448
1306 1 1449 1
1307} 1450}
1308 1451
1309############################################################################# 1452#############################################################################
1310 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1311package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1312 1470
1313# TODO: wrap into common Box base class
1314
1315our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1316 1472
1317sub size_request { 1473sub new {
1318 my ($self) = @_; 1474 my $class = shift;
1319 1475
1320 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1321 1477 vertical => 1,
1322 ( 1478 @_,
1323 (List::Util::max map $_->[0], @alloc),
1324 (List::Util::sum map $_->[1], @alloc),
1325 ) 1479 )
1326}
1327
1328sub size_allocate {
1329 my ($self, $w, $h) = @_;
1330
1331 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1332
1333 my $children = $self->{children};
1334
1335 my @h = map $_->{req_h}, @$children;
1336
1337 my $req_h = List::Util::sum @h;
1338
1339 if ($req_h > $h) {
1340 # ah well, not enough space
1341 $_ *= $h / $req_h for @h;
1342 } else {
1343 my $exp = List::Util::sum map $_->{expand}, @$children;
1344 $exp ||= 1;
1345
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348
1349 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1350 }
1351 }
1352
1353 CFClient::UI::harmonize \@h;
1354
1355 my $y = 0;
1356 for (0 .. $#$children) {
1357 my $child = $children->[$_];
1358 my $h = $h[$_];
1359 $child->configure (0, $y, $w, $h);
1360
1361 $y += $h;
1362 }
1363
1364 1
1365} 1480}
1366 1481
1367############################################################################# 1482#############################################################################
1368 1483
1369package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1386 ellipsise => 3, # end 1501 ellipsise => 3, # end
1387 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1388 fontsize => 1, 1503 fontsize => 1,
1389 align => -1, 1504 align => -1,
1390 valign => -1, 1505 valign => -1,
1391 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1392 can_events => 0, 1508 can_events => 0,
1393 %arg 1509 %arg
1394 ); 1510 );
1395 1511
1396 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1432 $self->{text} = "T$text"; 1548 $self->{text} = "T$text";
1433 1549
1434 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1435 $self->{layout}->set_text ($text); 1551 $self->{layout}->set_text ($text);
1436 1552
1553 $self->realloc;
1437 $self->update; 1554 $self->update;
1438 $self->check_size;
1439} 1555}
1440 1556
1441sub set_markup { 1557sub set_markup {
1442 my ($self, $markup) = @_; 1558 my ($self, $markup) = @_;
1443 1559
… …
1447 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1563 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1448 1564
1449 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1450 $self->{layout}->set_markup ($markup); 1566 $self->{layout}->set_markup ($markup);
1451 1567
1568 $self->realloc;
1452 $self->update; 1569 $self->update;
1453 $self->check_size;
1454} 1570}
1455 1571
1456sub size_request { 1572sub size_request {
1457 my ($self) = @_; 1573 my ($self) = @_;
1458 1574
… …
1472 1588
1473 $w = List::Util::max $w, $w2; 1589 $w = List::Util::max $w, $w2;
1474 $h = List::Util::max $h, $h2; 1590 $h = List::Util::max $h, $h2;
1475 } 1591 }
1476 1592
1477 ( 1593 ($w, $h)
1478 $w + $self->{padding} * 2,
1479 $h + $self->{padding} * 2,
1480 )
1481} 1594}
1482 1595
1483sub size_allocate { 1596sub size_allocate {
1484 my ($self, $w, $h) = @_; 1597 my ($self, $w, $h) = @_;
1485 1598
1599 delete $self->{ox};
1600
1486 delete $self->{texture}; 1601 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1487} 1603}
1488 1604
1489sub set_fontsize { 1605sub set_fontsize {
1490 my ($self, $fontsize) = @_; 1606 my ($self, $fontsize) = @_;
1491 1607
1492 $self->{fontsize} = $fontsize; 1608 $self->{fontsize} = $fontsize;
1493 delete $self->{texture}; 1609 delete $self->{texture};
1494 1610
1495 $self->update; 1611 $self->realloc;
1496 $self->check_size;
1497} 1612}
1498 1613
1499sub _draw { 1614sub _draw {
1500 my ($self) = @_; 1615 my ($self) = @_;
1501 1616
… …
1507 $self->{layout}->set_width ($self->{w}); 1622 $self->{layout}->set_width ($self->{w});
1508 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1623 $self->{layout}->set_ellipsise ($self->{ellipsise});
1509 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1626
1512 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1627 new_from_layout CFClient::Texture $self->{layout}
1628 };
1513 1629
1630 unless (exists $self->{ox}) {
1514 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1515 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1516 : ($self->{w} - $tex->{w}) * 0.5); 1633 : ($self->{w} - $tex->{w}) * 0.5);
1517 1634
1518 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1519 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1520 : ($self->{h} - $tex->{h}) * 0.5); 1637 : ($self->{h} - $tex->{h}) * 0.5);
1521
1522 $tex
1523 }; 1638 };
1524 1639
1525 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1527 1642
… …
1565 1680
1566 delete $self->{cur_h}; 1681 delete $self->{cur_h};
1567 1682
1568 return if $self->{text} eq $text; 1683 return if $self->{text} eq $text;
1569 1684
1570 delete $self->{texture};
1571
1572 $self->{last_activity} = $::NOW; 1685 $self->{last_activity} = $::NOW;
1573 $self->{text} = $text; 1686 $self->{text} = $text;
1574 1687
1575 $text =~ s/./*/g if $self->{hidden}; 1688 $text =~ s/./*/g if $self->{hidden};
1576 $self->{layout}->set_text ("$text "); 1689 $self->{layout}->set_text ("$text ");
1577 1690
1578 $self->_emit (changed => $self->{text}); 1691 $self->_emit (changed => $self->{text});
1692 $self->update;
1579} 1693}
1580 1694
1581sub set_text { 1695sub set_text {
1582 my ($self, $text) = @_; 1696 my ($self, $text) = @_;
1583 1697
1584 $self->{cursor} = length $text; 1698 $self->{cursor} = length $text;
1585 $self->_set_text ($text); 1699 $self->_set_text ($text);
1586 $self->update; 1700
1587 $self->check_size; 1701 $self->realloc;
1588} 1702}
1589 1703
1590sub get_text { 1704sub get_text {
1591 $_[0]{text} 1705 $_[0]{text}
1592} 1706}
… …
1622 $self->{cursor} = length $text; 1736 $self->{cursor} = length $text;
1623 } elsif ($uni == 27) { 1737 } elsif ($uni == 27) {
1624 $self->_emit ('escape'); 1738 $self->_emit ('escape');
1625 } elsif ($uni) { 1739 } elsif ($uni) {
1626 substr $text, $self->{cursor}++, 0, chr $uni; 1740 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else {
1742 return 0;
1627 } 1743 }
1628 1744
1629 $self->_set_text ($text); 1745 $self->_set_text ($text);
1630 $self->update; 1746
1631 $self->check_size; 1747 $self->realloc;
1748
1749 1
1632} 1750}
1633 1751
1634sub focus_in { 1752sub focus_in {
1635 my ($self) = @_; 1753 my ($self) = @_;
1636 1754
… …
1651 utf8::encode $text; 1769 utf8::encode $text;
1652 $self->{cursor} = length substr $text, 0, $idx; 1770 $self->{cursor} = length substr $text, 0, $idx;
1653 1771
1654 $self->_set_text ($self->{text}); 1772 $self->_set_text ($self->{text});
1655 $self->update; 1773 $self->update;
1774
1775 1
1656} 1776}
1657 1777
1658sub mouse_motion { 1778sub mouse_motion {
1659 my ($self, $ev, $x, $y) = @_; 1779 my ($self, $ev, $x, $y) = @_;
1660# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781
1782 0
1661} 1783}
1662 1784
1663sub _draw { 1785sub _draw {
1664 my ($self) = @_; 1786 my ($self) = @_;
1665 1787
1666 local $self->{fg} = $self->{fg}; 1788 local $self->{fg} = $self->{fg};
1667 1789
1668 if ($FOCUS == $self) { 1790 if ($FOCUS == $self) {
1669 glColor @{$self->{active_bg}}; 1791 glColor_premultiply @{$self->{active_bg}};
1670 $self->{fg} = $self->{active_fg}; 1792 $self->{fg} = $self->{active_fg};
1671 } else { 1793 } else {
1672 glColor @{$self->{bg}}; 1794 glColor_premultiply @{$self->{bg}};
1673 } 1795 }
1674 1796
1675 glEnable GL_BLEND; 1797 glEnable GL_BLEND;
1676 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1798 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1677 glBegin GL_QUADS; 1799 glBegin GL_QUADS;
1678 glVertex 0 , 0; 1800 glVertex 0 , 0;
1679 glVertex 0 , $self->{h}; 1801 glVertex 0 , $self->{h};
1680 glVertex $self->{w}, $self->{h}; 1802 glVertex $self->{w}, $self->{h};
1681 glVertex $self->{w}, 0; 1803 glVertex $self->{w}, 0;
… …
1742 } else { 1864 } else {
1743 $self->set_text ($self->{history_saveback}); 1865 $self->set_text ($self->{history_saveback});
1744 } 1866 }
1745 1867
1746 } else { 1868 } else {
1747 $self->SUPER::key_down ($ev); 1869 return $self->SUPER::key_down ($ev)
1870 }
1871
1748 } 1872 1
1749
1750} 1873}
1751 1874
1752############################################################################# 1875#############################################################################
1753 1876
1754package CFClient::UI::Button; 1877package CFClient::UI::Button;
… …
1763 1886
1764sub new { 1887sub new {
1765 my $class = shift; 1888 my $class = shift;
1766 1889
1767 $class->SUPER::new ( 1890 $class->SUPER::new (
1768 padding => 4, 1891 padding_x => 4,
1892 padding_y => 4,
1769 fg => [1, 1, 1], 1893 fg => [1, 1, 1],
1770 active_fg => [0, 0, 1], 1894 active_fg => [0, 0, 1],
1771 can_hover => 1, 1895 can_hover => 1,
1772 align => 0, 1896 align => 0,
1773 valign => 0, 1897 valign => 0,
… …
1782 my ($self, $ev, $x, $y) = @_; 1906 my ($self, $ev, $x, $y) = @_;
1783 1907
1784 $self->emit ("activate") 1908 $self->emit ("activate")
1785 if $x >= 0 && $x < $self->{w} 1909 if $x >= 0 && $x < $self->{w}
1786 && $y >= 0 && $y < $self->{h}; 1910 && $y >= 0 && $y < $self->{h};
1911
1912 1
1787} 1913}
1788 1914
1789sub _draw { 1915sub _draw {
1790 my ($self) = @_; 1916 my ($self) = @_;
1791 1917
… …
1820 1946
1821sub new { 1947sub new {
1822 my $class = shift; 1948 my $class = shift;
1823 1949
1824 $class->SUPER::new ( 1950 $class->SUPER::new (
1825 padding => 2, 1951 padding_x => 2,
1952 padding_y => 2,
1826 fg => [1, 1, 1], 1953 fg => [1, 1, 1],
1827 active_fg => [1, 1, 0], 1954 active_fg => [1, 1, 0],
1828 bg => [0, 0, 0, 0.2], 1955 bg => [0, 0, 0, 0.2],
1829 active_bg => [1, 1, 1, 0.5], 1956 active_bg => [1, 1, 1, 0.5],
1830 state => 0, 1957 state => 0,
… …
1834} 1961}
1835 1962
1836sub size_request { 1963sub size_request {
1837 my ($self) = @_; 1964 my ($self) = @_;
1838 1965
1839 ($self->{padding} * 2 + 6) x 2 1966 (6) x 2
1840} 1967}
1841 1968
1842sub button_down { 1969sub button_down {
1843 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1844 1971
1845 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1846 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1847 $self->{state} = !$self->{state}; 1974 $self->{state} = !$self->{state};
1848 $self->_emit (changed => $self->{state}); 1975 $self->_emit (changed => $self->{state});
1976 } else {
1977 return 0
1978 }
1979
1849 } 1980 1
1850} 1981}
1851 1982
1852sub _draw { 1983sub _draw {
1853 my ($self) = @_; 1984 my ($self) = @_;
1854 1985
1855 $self->SUPER::_draw; 1986 $self->SUPER::_draw;
1856 1987
1857 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1988 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1858 1989
1859 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1990 my ($w, $h) = @$self{qw(w h)};
1991
1992 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1860 1993
1861 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1994 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1862 1995
1863 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1996 my $tex = $self->{state} ? $tex[1] : $tex[0];
1864 1997
… …
2019 2152
2020 my $h1 = $self->{h} * (1 - $ycut1); 2153 my $h1 = $self->{h} * (1 - $ycut1);
2021 my $h2 = $self->{h} * (1 - $ycut2); 2154 my $h2 = $self->{h} * (1 - $ycut2);
2022 2155
2023 glEnable GL_BLEND; 2156 glEnable GL_BLEND;
2024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2025 glEnable GL_TEXTURE_2D; 2159 glEnable GL_TEXTURE_2D;
2026 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2027 2161
2028 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2162 glBindTexture GL_TEXTURE_2D, $t1->{name};
2029 glBegin GL_QUADS; 2163 glBegin GL_QUADS;
… …
2129 fg => [1, 1, 1], 2263 fg => [1, 1, 1],
2130 active_fg => [0, 0, 0], 2264 active_fg => [0, 0, 0],
2131 bg => [0, 0, 0, 0.2], 2265 bg => [0, 0, 0, 0.2],
2132 active_bg => [1, 1, 1, 0.5], 2266 active_bg => [1, 1, 1, 0.5],
2133 range => [0, 0, 100, 10, 0], 2267 range => [0, 0, 100, 10, 0],
2134 req_w => $::WIDTH / 80, 2268 min_w => $::WIDTH / 80,
2135 req_h => $::WIDTH / 80, 2269 min_h => $::WIDTH / 80,
2136 vertical => 0, 2270 vertical => 0,
2137 can_hover => 1, 2271 can_hover => 1,
2138 inner_pad => 0.02, 2272 inner_pad => 0.02,
2139 @_ 2273 @_
2140 ); 2274 );
… …
2143 $self->update; 2277 $self->update;
2144 2278
2145 $self 2279 $self
2146} 2280}
2147 2281
2282sub changed { }
2283
2148sub set_range { 2284sub set_range {
2149 my ($self, $range) = @_; 2285 my ($self, $range) = @_;
2150 2286
2151 ($range, $self->{range}) = ($self->{range}, $range); 2287 ($range, $self->{range}) = ($self->{range}, $range);
2152 2288
… …
2178} 2314}
2179 2315
2180sub size_request { 2316sub size_request {
2181 my ($self) = @_; 2317 my ($self) = @_;
2182 2318
2183 my $w = $self->{req_w}; 2319 ($self->{req_w}, $self->{req_h})
2184 my $h = $self->{req_h};
2185
2186 $self->{vertical} ? ($h, $w) : ($w, $h)
2187} 2320}
2188 2321
2189sub button_down { 2322sub button_down {
2190 my ($self, $ev, $x, $y) = @_; 2323 my ($self, $ev, $x, $y) = @_;
2191 2324
2192 $self->SUPER::button_down ($ev, $x, $y); 2325 $self->SUPER::button_down ($ev, $x, $y);
2193 2326
2194 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2195 2328
2196 $self->mouse_motion ($ev, $x, $y); 2329 $self->mouse_motion ($ev, $x, $y)
2197} 2330}
2198 2331
2199sub mouse_motion { 2332sub mouse_motion {
2200 my ($self, $ev, $x, $y) = @_; 2333 my ($self, $ev, $x, $y) = @_;
2201 2334
… …
2205 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2338 my (undef, $lo, $hi, $page) = @{$self->{range}};
2206 2339
2207 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2340 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2208 2341
2209 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2342 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2343 } else {
2344 return 0;
2345 }
2346
2210 } 2347 1
2211} 2348}
2212 2349
2213sub update { 2350sub update {
2214 my ($self) = @_; 2351 my ($self) = @_;
2215 2352
2216 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2353 delete $self->{knob_w};
2354 $self->SUPER::update;
2355}
2356
2357sub _draw {
2358 my ($self) = @_;
2359
2360 unless ($self->{knob_w}) {
2217 $self->set_value ($self->{range}[0]); 2361 $self->set_value ($self->{range}[0]);
2218 2362
2219 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2363 my ($value, $lo, $hi, $page) = @{$self->{range}};
2220 my $range = ($hi - $page - $lo) || 1e-100; 2364 my $range = ($hi - $page - $lo) || 1e-100;
2221 2365
… …
2227 $value = ($value - $lo) / $range; 2371 $value = ($value - $lo) / $range;
2228 $value = $value * $self->{scale} + $self->{offset}; 2372 $value = $value * $self->{scale} + $self->{offset};
2229 2373
2230 $self->{knob_x} = $value - $knob_w * 0.5; 2374 $self->{knob_x} = $value - $knob_w * 0.5;
2231 $self->{knob_w} = $knob_w; 2375 $self->{knob_w} = $knob_w;
2232 }); 2376 }
2233
2234 $self->SUPER::update;
2235}
2236
2237sub _draw {
2238 my ($self) = @_;
2239 2377
2240 $self->SUPER::_draw (); 2378 $self->SUPER::_draw ();
2241 2379
2242 glScale $self->{w}, $self->{h}; 2380 glScale $self->{w}, $self->{h};
2243 2381
… …
2542 2680
2543sub new { 2681sub new {
2544 my $class = shift; 2682 my $class = shift;
2545 2683
2546 my $self = $class->SUPER::new ( 2684 my $self = $class->SUPER::new (
2547 state => 0, 2685 state => 0,
2548 connect_activate => \&toggle_flopper, 2686 on_activate => \&toggle_flopper,
2549 @_ 2687 @_
2550 ); 2688 );
2551 2689
2552 if ($self->{state}) {
2553 $self->{state} = 0;
2554 $self->toggle_flopper;
2555 }
2556
2557 $self 2690 $self
2558} 2691}
2559 2692
2560sub toggle_flopper { 2693sub toggle_flopper {
2561 my ($self) = @_; 2694 my ($self) = @_;
2562 2695
2563 # TODO: use animation 2696 $self->{other}->toggle_visibility;
2564 if ($self->{state} = !$self->{state}) {
2565 $CFClient::UI::ROOT->add ($self->{other});
2566 $self->{other}->move ($self->coord2global (0, $self->{h}));
2567 $self->_emit ("open");
2568 } else {
2569 $CFClient::UI::ROOT->remove ($self->{other});
2570 $self->_emit ("close");
2571 }
2572
2573 $self->_emit (changed => $self->{state});
2574} 2697}
2575 2698
2576############################################################################# 2699#############################################################################
2577 2700
2578package CFClient::UI::Tooltip; 2701package CFClient::UI::Tooltip;
… …
2591} 2714}
2592 2715
2593sub set_tooltip_from { 2716sub set_tooltip_from {
2594 my ($self, $widget) = @_; 2717 my ($self, $widget) = @_;
2595 2718
2719 my $tooltip = $widget->{tooltip};
2720
2721 if ($ENV{CFPLUS_DEBUG} & 2) {
2722 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}";
2726 }
2727
2596 $self->add (new CFClient::UI::Label 2728 $self->add (new CFClient::UI::Label
2597 markup => $widget->{tooltip}, 2729 markup => $tooltip,
2598 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2599 fontsize => 0.8, 2731 fontsize => 0.8,
2600 fg => [0, 0, 0, 1], 2732 fg => [0, 0, 0, 1],
2601 ellipsise => 0, 2733 ellipsise => 0,
2602 font => ($widget->{tooltip_font} || $::FONT_PROP), 2734 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2613 2745
2614sub size_allocate { 2746sub size_allocate {
2615 my ($self, $w, $h) = @_; 2747 my ($self, $w, $h) = @_;
2616 2748
2617 $self->SUPER::size_allocate ($w - 4, $h - 4); 2749 $self->SUPER::size_allocate ($w - 4, $h - 4);
2750}
2751
2752sub visibility_change {
2753 my ($self, $visible) = @_;
2754
2755 return unless $visible;
2756
2757 $self->{root}->on_post_alloc ("move_$self" => sub {
2758 my $widget = $self->{owner}
2759 or return;
2760
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH;
2765
2766 $self->move_abs ($x, $y);
2767 });
2618} 2768}
2619 2769
2620sub _draw { 2770sub _draw {
2621 my ($self) = @_; 2771 my ($self) = @_;
2622 2772
… …
2639 glVertex $w, $h; 2789 glVertex $w, $h;
2640 glVertex $w, 0; 2790 glVertex $w, 0;
2641 glEnd; 2791 glEnd;
2642 2792
2643 glTranslate 2 - 0.375, 2 - 0.375; 2793 glTranslate 2 - 0.375, 2 - 0.375;
2794
2644 $self->SUPER::_draw; 2795 $self->SUPER::_draw;
2645} 2796}
2646 2797
2647############################################################################# 2798#############################################################################
2648 2799
… …
2724 $self->SUPER::DESTROY; 2875 $self->SUPER::DESTROY;
2725} 2876}
2726 2877
2727############################################################################# 2878#############################################################################
2728 2879
2729package CFClient::UI::Inventory; 2880package CFClient::UI::Buttonbar;
2730 2881
2731our @ISA = CFClient::UI::ScrolledWindow::; 2882our @ISA = CFClient::UI::HBox::;
2732 2883
2733sub new { 2884# TODO: should actualyl wrap buttons and other goodies.
2734 my $class = shift;
2735
2736 my $self = $class->SUPER::new (
2737 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2738 @_,
2739 );
2740
2741 $self
2742}
2743
2744sub set_items {
2745 my ($self, $items) = @_;
2746
2747 $self->{scrolled}->clear;
2748 return unless $items;
2749
2750 my @items = sort {
2751 ($a->{type} <=> $b->{type})
2752 or ($a->{name} cmp $b->{name})
2753 } @$items;
2754
2755 $self->{real_items} = \@items;
2756
2757 my $row = 0;
2758 for my $item (@items) {
2759 CFClient::Item::update_widgets $item;
2760
2761 $self->{scrolled}->add (0, $row, $item->{face_widget});
2762 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2763 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2764
2765 $row++;
2766 }
2767}
2768
2769sub size_request {
2770 my ($self) = @_;
2771 ($self->{req_w}, $self->{req_h});
2772}
2773 2885
2774############################################################################# 2886#############################################################################
2775 2887
2776package CFClient::UI::Menu; 2888package CFClient::UI::Menu;
2777 2889
… …
2818 # maybe save $GRAB? must be careful about events... 2930 # maybe save $GRAB? must be careful about events...
2819 $GRAB = $self; 2931 $GRAB = $self;
2820 $self->{button} = $ev->{button}; 2932 $self->{button} = $ev->{button};
2821 2933
2822 $self->show; 2934 $self->show;
2823 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2824} 2936}
2825 2937
2826sub mouse_motion { 2938sub mouse_motion {
2827 my ($self, $ev, $x, $y) = @_; 2939 my ($self, $ev, $x, $y) = @_;
2828 2940
2829 # TODO: should use vbox->find_widget or so 2941 # TODO: should use vbox->find_widget or so
2830 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2831 $self->{hover} = $self->{item}{$HOVER}; 2943 $self->{hover} = $self->{item}{$HOVER};
2944
2945 0
2832} 2946}
2833 2947
2834sub button_up { 2948sub button_up {
2835 my ($self, $ev, $x, $y) = @_; 2949 my ($self, $ev, $x, $y) = @_;
2836 2950
… …
2838 undef $GRAB; 2952 undef $GRAB;
2839 $self->hide; 2953 $self->hide;
2840 2954
2841 $self->_emit ("popdown"); 2955 $self->_emit ("popdown");
2842 $self->{hover}[1]->() if $self->{hover}; 2956 $self->{hover}[1]->() if $self->{hover};
2957 } else {
2958 return 0
2959 }
2960
2961 1
2962}
2963
2964#############################################################################
2965
2966package CFClient::UI::Multiplexer;
2967
2968our @ISA = CFClient::UI::Container::;
2969
2970sub new {
2971 my $class = shift;
2972
2973 my $self = $class->SUPER::new (
2974 @_,
2975 );
2976
2977 $self->{current} = $self->{children}[0]
2978 if @{ $self->{children} };
2979
2980 $self
2981}
2982
2983sub add {
2984 my ($self, @widgets) = @_;
2985
2986 $self->SUPER::add (@widgets);
2987
2988 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} };
2990}
2991
2992sub set_current_page {
2993 my ($self, $page_or_widget) = @_;
2994
2995 my $widget = ref $page_or_widget
2996 ? $page_or_widget
2997 : $self->{children}[$page_or_widget];
2998
2999 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001
3002 $self->_emit (page_changed => $self->{current});
3003
3004 $self->realloc;
3005}
3006
3007sub visible_children {
3008 $_[0]{current}
3009}
3010
3011sub size_request {
3012 my ($self) = @_;
3013
3014 $self->{current}->size_request
3015}
3016
3017sub size_allocate {
3018 my ($self, $w, $h) = @_;
3019
3020 $self->{current}->configure (0, 0, $w, $h);
3021}
3022
3023sub _draw {
3024 my ($self) = @_;
3025
3026 $self->{current}->draw;
3027}
3028
3029#############################################################################
3030
3031package CFClient::UI::Notebook;
3032
3033our @ISA = CFClient::UI::VBox::;
3034
3035sub new {
3036 my $class = shift;
3037
3038 my $self = $class->SUPER::new (
3039 buttonbar => (new CFClient::UI::Buttonbar),
3040 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3041 # filter => # will be put between multiplexer and $self
3042 @_,
3043 );
2843 } 3044
3045 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3046 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3047
3048 $self
3049}
3050
3051sub add {
3052 my ($self, $title, $widget, $tooltip) = @_;
3053
3054 Scalar::Util::weaken $self;
3055
3056 $self->{buttonbar}->add (new CFClient::UI::Button
3057 markup => $title,
3058 tooltip => $tooltip,
3059 on_activate => sub { $self->set_current_page ($widget) },
3060 );
3061
3062 $self->{multiplexer}->add ($widget);
3063}
3064
3065sub set_current_page {
3066 my ($self, $page) = @_;
3067
3068 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current});
2844} 3070}
2845 3071
2846############################################################################# 3072#############################################################################
2847 3073
2848package CFClient::UI::Statusbox; 3074package CFClient::UI::Statusbox;
… …
2953 $self->SUPER::reconfigure; 3179 $self->SUPER::reconfigure;
2954} 3180}
2955 3181
2956############################################################################# 3182#############################################################################
2957 3183
2958package CFClient::UI::Root; 3184package CFClient::UI::Inventory;
2959 3185
2960our @ISA = CFClient::UI::Container::; 3186our @ISA = CFClient::UI::ScrolledWindow::;
2961
2962use CFClient::OpenGL;
2963 3187
2964sub new { 3188sub new {
2965 my $class = shift; 3189 my $class = shift;
2966 3190
2967 $class->SUPER::new ( 3191 my $self = $class->SUPER::new (
3192 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3193 @_,
3194 );
3195
3196 $self
3197}
3198
3199sub set_items {
3200 my ($self, $items) = @_;
3201
3202 $self->{child}->clear;
3203 return unless $items;
3204
3205 my @items = sort {
3206 ($a->{type} <=> $b->{type})
3207 or ($a->{name} cmp $b->{name})
3208 } @$items;
3209
3210 $self->{real_items} = \@items;
3211
3212 my $row = 0;
3213 for my $item (@items) {
3214 CFClient::Item::update_widgets $item;
3215
3216 $self->{child}->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget});
3219
3220 $row++;
3221 }
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::BindEditor;
3227
3228our @ISA = CFClient::UI::FancyFrame::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3234
3235 $self->add (my $vb = new CFClient::UI::VBox);
3236
3237
3238 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3239 text => "start recording",
3240 tooltip => "Start/Stops recording of actions."
3241 ."All subsequent actions after the recording started will be captured."
3242 ."The actions are displayed after the record was stopped."
3243 ."To bind the action you have to click on the 'Bind' button",
3244 on_activate => sub {
3245 unless ($self->{recording}) {
3246 $self->start;
3247 } else {
3248 $self->stop;
3249 }
3250 });
3251
3252 $vb->add (new CFClient::UI::Label text => "Actions:");
3253 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3254
3255 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3258 $hb->add (new CFClient::UI::Button
3259 text => "bind",
3260 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3261 on_activate => sub {
3262 $self->ask_for_bind;
3263 });
3264
3265 $vb->add (my $hb = new CFClient::UI::HBox);
3266 $hb->add (new CFClient::UI::Button
3267 text => "ok",
3268 expand => 1,
3269 tooltip => "This closes the binding editor and saves the binding",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->commit;
3273 });
3274
3275 $hb->add (new CFClient::UI::Button
3276 text => "cancel",
3277 expand => 1,
3278 tooltip => "This closes the binding editor without saving",
3279 on_activate => sub {
3280 $self->hide;
3281 $self->{binding_cancel}->()
3282 if $self->{binding_cancel};
3283 });
3284
3285 $self->update_binding_widgets;
3286
3287 $self
3288}
3289
3290sub commit {
3291 my ($self) = @_;
3292 my ($mod, $sym, $cmds) = $self->get_binding;
3293 if ($sym != 0 && @$cmds > 0) {
3294 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3295 ."'. Don't forget 'Save Config'!");
3296 $self->{binding_change}->($mod, $sym, $cmds)
3297 if $self->{binding_change};
3298 } else {
3299 $::STATUSBOX->add ("No action bound, no key or action specified!");
3300 $self->{binding_cancel}->()
3301 if $self->{binding_cancel};
3302 }
3303}
3304
3305sub start {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("stop recording");
3309 $self->{recording} = 1;
3310 $self->clear_command_list;
3311 $::CONN->start_record if $::CONN;
3312}
3313
3314sub stop {
3315 my ($self) = @_;
3316
3317 $self->{rec_btn}->set_text ("start recording");
3318 $self->{recording} = 0;
3319
3320 my $rec;
3321 $rec = $::CONN->stop_record if $::CONN;
3322 return unless ref $rec eq 'ARRAY';
3323 $self->set_command_list ($rec);
3324}
3325
3326
3327sub ask_for_bind_and_commit {
3328 my ($self) = @_;
3329 $self->ask_for_bind (1);
3330}
3331
3332sub ask_for_bind {
3333 my ($self, $commit) = @_;
3334
3335 CFClient::Binder::open_binding_dialog (sub {
3336 my ($mod, $sym) = @_;
3337 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338 $self->update_binding_widgets;
3339 $self->commit if $commit;
3340 });
3341}
3342
3343# $mod and $sym are the modifiers and key symbol
3344# $cmds is a array ref of strings (the commands)
3345# $cb is the callback that is executed on OK
3346# $ccb is the callback that is executed on CANCEL and
3347# when the binding was unsuccessful on OK
3348sub set_binding {
3349 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3350
3351 $self->clear_command_list;
3352 $self->{recording} = 0;
3353 $self->{rec_btn}->set_text ("start recording");
3354
3355 $self->{binding} = [$mod, $sym];
3356 $self->{commands} = $cmds;
3357
3358 $self->{binding_change} = $cb;
3359 $self->{binding_cancel} = $ccb;
3360
3361 $self->update_binding_widgets;
3362}
3363
3364# this is a shortcut method that asks for a binding
3365# and then just binds it.
3366sub do_quick_binding {
3367 my ($self, $cmds) = @_;
3368 $self->set_binding (undef, undef, $cmds, sub {
3369 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370 });
3371 $self->ask_for_bind (1);
3372}
3373
3374sub update_binding_widgets {
3375 my ($self) = @_;
3376 my ($mod, $sym, $cmds) = $self->get_binding;
3377 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3378 $self->set_command_list ($cmds);
3379}
3380
3381sub get_binding {
3382 my ($self) = @_;
3383 return (
3384 $self->{binding}->[0],
3385 $self->{binding}->[1],
3386 [ grep { defined $_ } @{$self->{commands}} ]
3387 );
3388}
3389
3390sub clear_command_list {
3391 my ($self) = @_;
3392 $self->{cmdbox}->clear ();
3393}
3394
3395sub set_command_list {
3396 my ($self, $cmds) = @_;
3397
3398 $self->{cmdbox}->clear ();
3399 $self->{commands} = $cmds;
3400
3401 my $idx = 0;
3402
3403 for (@$cmds) {
3404 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3405
3406 my $i = $idx;
3407 $hb->add (new CFClient::UI::Label text => $_);
3408 $hb->add (new CFClient::UI::Button
3409 text => "delete",
3410 tooltip => "Deletes the action from the record",
3411 on_activate => sub {
3412 $self->{cmdbox}->remove ($hb);
3413 $cmds->[$i] = undef;
3414 });
3415
3416
3417 $idx++
3418 }
3419}
3420
3421#############################################################################
3422
3423package CFClient::UI::SpellList;
3424
3425our @ISA = CFClient::UI::Table::;
3426
3427sub new {
3428 my $class = shift;
3429
3430 my $self = $class->SUPER::new (
3431 binding => [],
3432 commands => [],
2968 @_, 3433 @_,
2969 ) 3434 )
2970} 3435}
2971 3436
2972sub configure { 3437# XXX: Do sorting? Argl...
2973 my ($self, $x, $y, $w, $h) = @_; 3438sub add_spell {
2974
2975 $self->{w} = $w;
2976 $self->{h} = $h;
2977}
2978
2979sub check_size {
2980 my ($self) = @_; 3439 my ($self, $spell) = @_;
3440 $self->{spells}->{$spell->{name}} = $spell;
2981 3441
2982 $self->size_allocate ($self->{w}, $self->{h}) 3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2983 if $self->{w}; 3443 face => $spell->{face},
3444 can_hover => 1,
3445 can_events => 1,
3446 tooltip => $spell->{message});
3447
3448 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => $spell->{name},
3450 can_hover => 1,
3451 can_events => 1,
3452 tooltip => $spell->{message},
3453 expand => 1);
3454
3455 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458 expand => 1);
3459
3460 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461 text => "bind to key",
3462 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463}
3464
3465sub rebuild_spell_list {
3466 my ($self) = @_;
3467 $self->{tbl_idx} = 0;
3468 $self->add_spell ($_) for values %{$self->{spells}};
3469}
3470
3471sub remove_spell {
3472 my ($self, $spell) = @_;
3473 delete $self->{spells}->{$spell->{name}};
3474 $self->rebuild_spell_list;
3475}
3476
3477#############################################################################
3478
3479package CFClient::UI::Root;
3480
3481our @ISA = CFClient::UI::Container::;
3482
3483use CFClient::OpenGL;
3484
3485sub new {
3486 my $class = shift;
3487
3488 my $self = $class->SUPER::new (
3489 visible => 1,
3490 @_,
3491 );
3492
3493 Scalar::Util::weaken ($self->{root} = $self);
3494
3495 $self
2984} 3496}
2985 3497
2986sub size_request { 3498sub size_request {
2987 my ($self) = @_; 3499 my ($self) = @_;
2988 3500
2989 ($self->{w}, $self->{h}) 3501 ($self->{w}, $self->{h})
3502}
3503
3504sub _to_pixel {
3505 my ($coord, $size, $max) = @_;
3506
3507 $coord =
3508 $coord eq "center" ? ($max - $size) * 0.5
3509 : $coord eq "max" ? $max
3510 : $coord;
3511
3512 $coord = 0 if $coord < 0;
3513 $coord = $max - $size if $coord > $max - $size;
3514
3515 int $coord + 0.5
2990} 3516}
2991 3517
2992sub size_allocate { 3518sub size_allocate {
2993 my ($self, $w, $h) = @_; 3519 my ($self, $w, $h) = @_;
2994 3520
2995 for my $child ($self->children) { 3521 for my $child ($self->children) {
2996 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2997 3523
2998 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3524 $X = $child->{force_x} if exists $child->{force_x};
2999 if exists $child->{req_x}; 3525 $Y = $child->{force_y} if exists $child->{force_y};
3000 3526
3001 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3527 $X = _to_pixel $X, $W, $self->{w};
3002 if exists $child->{req_y}; 3528 $Y = _to_pixel $Y, $H, $self->{h};
3003
3004 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3005 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3006 3529
3007 $child->configure ($X, $Y, $W, $H); 3530 $child->configure ($X, $Y, $W, $H);
3008 } 3531 }
3009} 3532}
3010 3533
… …
3021} 3544}
3022 3545
3023sub update { 3546sub update {
3024 my ($self) = @_; 3547 my ($self) = @_;
3025 3548
3026 $self->check_size;
3027 $::WANT_REFRESH++; 3549 $::WANT_REFRESH++;
3028} 3550}
3029 3551
3030sub add { 3552sub add {
3031 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
3032 3554
3033 for (my @widgets = @children; my $w = pop @widgets; ) {
3034 push @widgets, $w->children;
3035 $w->{root} = $self;
3036 $w->{visible} = 1;
3037 }
3038
3039 for my $child (@children) {
3040 $child->{is_toplevel} = 1; 3555 $_->{is_toplevel} = 1
3041 3556 for @children;
3042 # integerise window positions
3043 $child->{x} = int $child->{x};
3044 $child->{y} = int $child->{y};
3045 }
3046 3557
3047 $self->SUPER::add (@children); 3558 $self->SUPER::add (@children);
3048} 3559}
3049 3560
3050sub remove { 3561sub remove {
3051 my ($self, @children) = @_; 3562 my ($self, @children) = @_;
3052 3563
3053 $self->SUPER::remove (@children); 3564 $self->SUPER::remove (@children);
3565
3566 delete $self->{is_toplevel}
3567 for @children;
3054 3568
3055 while (@children) { 3569 while (@children) {
3056 my $w = pop @children; 3570 my $w = pop @children;
3057 push @children, $w->children; 3571 push @children, $w->children;
3058 $w->set_invisible; 3572 $w->set_invisible;
… …
3077 while ($self->{refresh_hook}) { 3591 while ($self->{refresh_hook}) {
3078 $_->() 3592 $_->()
3079 for values %{delete $self->{refresh_hook}}; 3593 for values %{delete $self->{refresh_hook}};
3080 } 3594 }
3081 3595
3082 if ($self->{check_size}) { 3596 if ($self->{realloc}) {
3083 my @queue = ([], []); 3597 my %queue;
3598 my @queue;
3599 my $widget;
3084 3600
3085 for (;;) { 3601 outer:
3086 if ($self->{check_size}) { 3602 while () {
3087 # heuristic: check containers last 3603 if (my $realloc = delete $self->{realloc}) {
3088 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3604 for $widget (values %$realloc) {
3089 for values %{delete $self->{check_size}} 3605 $widget->{visible} or next; # do not resize invisible widgets
3606
3607 $queue{$widget+0}++ and next; # duplicates are common
3608
3609 push @{ $queue[$widget->{visible}] }, $widget;
3610 }
3090 } 3611 }
3091 3612
3092 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3613 while () {
3614 @queue or last outer;
3093 3615
3094 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3616 $widget = pop @{ $queue[-1] || [] }
3095 ? @$widget{qw(user_w user_h)} 3617 and last;
3096 : $widget->size_request;
3097
3098 if (delete $widget->{force_alloc}
3099 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3100 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3101 3618
3619 pop @queue;
3620 }
3621
3622 delete $queue{$widget+0};
3623
3624 my ($w, $h) = $widget->size_request;
3625
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3628
3629 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h};
3631
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3633 || delete $widget->{force_realloc}) {
3102 $widget->{req_w} = $w; 3634 $widget->{req_w} = $w;
3103 $widget->{req_h} = $h; 3635 $widget->{req_h} = $h;
3104 3636
3105 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3637 $self->{size_alloc}{$widget+0} = $widget;
3106 3638
3107 $widget->{parent}->check_size
3108 if $widget->{parent}; 3639 if (my $parent = $widget->{parent}) {
3640 $self->{realloc}{$parent+0} = $parent
3641 unless $queue{$parent+0};
3642
3643 $parent->{force_size_alloc} = 1;
3644 $self->{size_alloc}{$parent+0} = $parent;
3645 }
3109 } 3646 }
3647
3648 delete $self->{realloc}{$widget+0};
3110 } 3649 }
3111 } 3650 }
3112 3651
3113 while ($self->{size_alloc}) { 3652 while (my $size_alloc = delete $self->{size_alloc}) {
3114 for (values %{delete $self->{size_alloc}}) { 3653 my @queue = sort { $b->{visible} <=> $a->{visible} }
3115 my ($widget, $w, $h) = @$_; 3654 values %$size_alloc;
3655
3656 while () {
3657 my $widget = pop @queue || last;
3658
3659 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3116 3660
3117 $w = 0 if $w < 0; 3661 $w = 0 if $w < 0;
3118 $h = 0 if $h < 0; 3662 $h = 0 if $h < 0;
3119 3663
3664 $w = int $w + 0.5;
3665 $h = int $h + 0.5;
3666
3667 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3668 $widget->{old_w} = $widget->{w};
3669 $widget->{old_h} = $widget->{h};
3670
3120 $widget->{w} = $w; 3671 $widget->{w} = $w;
3121 $widget->{h} = $h; 3672 $widget->{h} = $h;
3673
3122 $widget->emit (size_allocate => $w, $h); 3674 $widget->emit (size_allocate => $w, $h);
3675 }
3123 } 3676 }
3124 } 3677 }
3125 3678
3126 while ($self->{post_alloc_hook}) { 3679 while ($self->{post_alloc_hook}) {
3127 $_->() 3680 $_->()
3128 for values %{delete $self->{post_alloc_hook}}; 3681 for values %{delete $self->{post_alloc_hook}};
3129 } 3682 }
3683
3130 3684
3131 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3685 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3132 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3686 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3133 glClear GL_COLOR_BUFFER_BIT; 3687 glClear GL_COLOR_BUFFER_BIT;
3134 3688
… …
3136 glLoadIdentity; 3690 glLoadIdentity;
3137 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3138 glMatrixMode GL_MODELVIEW; 3692 glMatrixMode GL_MODELVIEW;
3139 glLoadIdentity; 3693 glLoadIdentity;
3140 3694
3695 {
3696 package CFClient::UI::Base;
3697
3698 ($draw_x, $draw_y, $draw_w, $draw_h) =
3699 (0, 0, $self->{w}, $self->{h});
3700 }
3701
3141 $self->_draw; 3702 $self->_draw;
3142} 3703}
3143 3704
3144############################################################################# 3705#############################################################################
3145 3706

Diff Legend

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