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.242 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 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};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
45 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
46 54
47 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
48 56
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 58
51 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 60 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
… …
172sub rescale_widgets { 171sub rescale_widgets {
173 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
174 173
175 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
176 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
177 $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.]+$/;
178 $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};
179 $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};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $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.]+$/;
182 $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};
183 $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};
184 $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
185 } 189 }
186 } 190 }
187 191
188 reconfigure_widgets; 192 reconfigure_widgets;
189} 193}
… …
198 202
199sub new { 203sub new {
200 my $class = shift; 204 my $class = shift;
201 205
202 my $self = bless { 206 my $self = bless {
203 x => 0, 207 x => "center",
204 y => 0, 208 y => "center",
205 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
206 can_events => 1, 212 can_events => 1,
207 @_ 213 @_
208 }, $class; 214 }, $class;
209 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
210 for (keys %$self) { 218 for (keys %$self) {
211 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
213 } 221 }
214 } 222 }
215 223
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 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};
223 } 234 }
224 235
225 $self 236 $self
226} 237}
227 238
… …
232 %$self = (); 243 %$self = ();
233} 244}
234 245
235sub show { 246sub show {
236 my ($self) = @_; 247 my ($self) = @_;
248
237 return if $self->{parent}; 249 return if $self->{parent};
238 250
239 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
240} 252}
241 253
242sub show_centered { 254sub set_visible {
243 my ($self) = @_; 255 my ($self) = @_;
256
244 return if $self->{parent}; 257 return if $self->{visible};
245 258
246 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
247 261
248 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
249 "centered $self" => sub { 263
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
251 }, 265
252 ); 266 $_->set_visible for $self->children;
253} 267}
254 268
255sub set_invisible { 269sub set_invisible {
256 my ($self) = @_; 270 my ($self) = @_;
257 271
258 # broken show/hide model 272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
259 275
260 delete $self->{root}; 276 delete $self->{root};
261 delete $self->{visible}; 277 delete $self->{visible};
262 278
263 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
265 281
266 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
268 284
269 $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;
270} 305}
271 306
272sub hide { 307sub hide {
273 my ($self) = @_; 308 my ($self) = @_;
274 309
… …
276 311
277 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
278 if $self->{parent}; 313 if $self->{parent};
279} 314}
280 315
281sub move { 316sub move_abs {
282 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
283 318
284 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
285 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
286 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
287 322
288 $self->update; 323 $self->update;
289} 324}
290 325
291sub set_size { 326sub set_size {
292 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
293 328
294 $self->{user_w} = $w; 329 $self->{force_w} = $w;
295 $self->{user_h} = $h; 330 $self->{force_h} = $h;
296 331
297 $self->check_size; 332 $self->realloc;
298} 333}
299 334
300sub size_request { 335sub size_request {
301 require Carp; 336 require Carp;
302 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
304 339
305sub configure { 340sub configure {
306 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
307 342
308 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
309 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
310 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
311 348
312 # use alignment to adjust x, y 349 # use alignment to adjust x, y
313 350
314 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
315 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
316
317 ($w, $h) = ($w2, $h2);
318 } 353 }
319 354
320 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
321 $self->{x} = $x; 356 $self->{x} = $x;
322 $self->{y} = $y; 357 $self->{y} = $y;
323 $self->update; 358 $self->update;
324 } 359 }
325 360
326 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327 $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;
328 } 368 }
329} 369}
330 370
331sub size_allocate { 371sub size_allocate {
332 # nothing to be done 372 # nothing to be done
333} 373}
334 374
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340}
341
342sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
343} 381}
344 382
345sub set_max_size { 383sub set_max_size {
346 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
347 385
… …
406 444
407 $::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
408 unless $FOCUS; 446 unless $FOCUS;
409} 447}
410 448
411sub mouse_motion { } 449sub mouse_motion { 0 }
412sub button_up { } 450sub button_up { 0 }
413sub key_down { } 451sub key_down { 0 }
414sub key_up { } 452sub key_up { 0 }
415 453
416sub button_down { 454sub button_down {
417 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
418 456
419 $self->focus_in; 457 $self->focus_in;
420}
421 458
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
426sub 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
427 535
428sub draw { 536sub draw {
429 my ($self) = @_; 537 my ($self) = @_;
430 538
431 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);
432 550
433 glPushMatrix; 551 glPushMatrix;
434 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
435 $self->_draw;
436 glPopMatrix;
437 553
438 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
439 my ($x, $y) = @$self{qw(x y)};
440
441 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
442 glEnable GL_BLEND; 556 glEnable GL_BLEND;
443 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
444 glBegin GL_QUADS; 558 glBegin GL_QUADS;
445 glVertex $x , $y; 559 glVertex 0 , 0;
446 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
447 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
448 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
449 glEnd; 563 glEnd;
450 glDisable GL_BLEND; 564 glDisable GL_BLEND;
451 } 565 }
452 566
453 if ($ENV{PCLIENT_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
454 glPushMatrix; 568 glPushMatrix;
455 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
457 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0; 572 glVertex 0 , 0;
459 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
460 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
461 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
462 glEnd; 576 glEnd;
463 glPopMatrix; 577 glPopMatrix;
464 #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;
465 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
466} 583}
467 584
468sub _draw { 585sub _draw {
469 my ($self) = @_; 586 my ($self) = @_;
470 587
471 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
472}
473
474sub find_widget {
475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
478
479 return $self
480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483 ()
484}
485
486sub set_parent {
487 my ($self, $parent) = @_;
488
489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
499}
500
501sub check_size {
502 my ($self, $forced) = @_;
503
504 $self->{force_alloc} = 1 if $forced;
505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519}
520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
527sub emit {
528 my ($self, $signal, @args) = @_;
529
530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
532} 589}
533 590
534sub DESTROY { 591sub DESTROY {
535 my ($self) = @_; 592 my ($self) = @_;
536 593
… …
568 625
569 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
570 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
571 628
572 glEnable GL_BLEND; 629 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
574 glColor @$color; 631 glColor_premultiply @$color;
575 632
576 glBegin GL_QUADS; 633 glBegin GL_QUADS;
577 glVertex 0 , 0; 634 glVertex 0 , 0;
578 glVertex 0 , $h; 635 glVertex 0 , $h;
579 glVertex $w, $h; 636 glVertex $w, $h;
… …
594 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
596} 653}
597 654
598sub size_request { 655sub size_request {
599 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
600} 659}
601 660
602sub draw { } 661sub draw { }
603 662
604############################################################################# 663#############################################################################
… …
608our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
609 668
610sub new { 669sub new {
611 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
612 671
613 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
614 673
615 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
616 children => [], 675 children => [],
617 can_events => 0, 676 can_events => 0,
618 %arg, 677 %arg,
619 ); 678 );
679
620 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
621 682
622 $self 683 $self
623} 684}
624 685
625sub add { 686sub add {
… …
633 $self->{children} = [ 694 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
636 ]; 697 ];
637 698
638 $self->check_size (1); 699 $self->realloc;
639 $self->update;
640} 700}
641 701
642sub children { 702sub children {
643 @{ $_[0]{children} } 703 @{ $_[0]{children} }
644} 704}
… …
649 delete $child->{parent}; 709 delete $child->{parent};
650 $child->hide; 710 $child->hide;
651 711
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 713
654 $self->check_size (1); 714 $self->realloc;
655 $self->update;
656} 715}
657 716
658sub clear { 717sub clear {
659 my ($self) = @_; 718 my ($self) = @_;
660 719
… …
664 for (@$children) { 723 for (@$children) {
665 delete $_->{parent}; 724 delete $_->{parent};
666 $_->hide; 725 $_->hide;
667 } 726 }
668 727
669 $self->check_size; 728 $self->realloc;
670 $self->update;
671} 729}
672 730
673sub find_widget { 731sub find_widget {
674 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
675 733
676 $x -= $self->{x}; 734 $x -= $self->{x};
677 $y -= $self->{y}; 735 $y -= $self->{y};
678 736
679 my $res; 737 my $res;
680 738
681 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
682 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
683 and return $res; 741 and return $res;
684 } 742 }
685 743
686 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
735 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
736} 794}
737 795
738############################################################################# 796#############################################################################
739 797
798# back-buffered drawing area
799
740package CFClient::UI::Window; 800package CFClient::UI::Window;
741 801
742our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
743 803
744use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
762 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
763 $self->update; 823 $self->update;
764} 824}
765 825
766sub _render { 826sub _render {
827 my ($self) = @_;
828
767 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
768} 830}
769 831
770sub render_child { 832sub render_child {
771 my ($self) = @_; 833 my ($self) = @_;
772 834
773 $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 {
774 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
775 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
776 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
777 $self->_render; 846 $self->_render;
778 }; 847 };
779} 848}
780 849
781sub _draw { 850sub _draw {
782 my ($self) = @_; 851 my ($self) = @_;
783 852
784 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
785 854
786 my $tex = $self->{texture} 855 my $tex = $self->{texture}
787 or return; 856 or return;
788 857
789 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
790 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;
791 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
792 863
793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad (0, 0, $w, $h);
794 865
866 glDisable GL_BLEND;
795 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
796} 868}
797 869
798############################################################################# 870#############################################################################
799 871
… …
812} 884}
813 885
814sub size_request { 886sub size_request {
815 my ($self) = @_; 887 my ($self) = @_;
816 888
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818 890
819 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
820} 895}
821 896
822sub size_allocate { 897sub size_allocate {
823 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
824 899
900 my $child = $self->child;
901
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827 904
828 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
829 $self->update; 906 $self->update;
830} 907}
831 908
… …
867} 944}
868 945
869sub _render { 946sub _render {
870 my ($self) = @_; 947 my ($self) = @_;
871 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
872 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873 953
874 $self->SUPER::_render; 954 $self->SUPER::_render;
875} 955}
876 956
… …
879package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
880 960
881our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
882 962
883sub new { 963sub new {
884 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
885 967
886 my $self; 968 my $self;
887 969
888 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
889 vertical => 1, 971 vertical => 1,
890 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
891 connect_changed => sub { 973 on_changed => sub {
892 $self->{vp}->set_offset (0, $_[1]); 974 $self->{vp}->set_offset (0, $_[1]);
893 }, 975 },
894 ; 976 ;
895 977
896 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
897 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
898 slider => $slider, 980 slider => $slider,
899 @_, 981 %arg,
900 ); 982 );
901 983
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
905 986
906 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
907} 994}
908 995
909sub update { 996sub update {
910 my ($self) = @_; 997 my ($self) = @_;
911 998
… …
950 1037
951 if ($self->{bg}) { 1038 if ($self->{bg}) {
952 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
953 1040
954 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
956 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
957 1044
958 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
959 glVertex 0 , 0; 1046 glVertex 0 , 0;
960 glVertex 0 , $h; 1047 glVertex 0 , $h;
961 glVertex $w, $h; 1048 glVertex $w, $h;
… …
974 1061
975our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
976 1063
977use CFClient::OpenGL; 1064use CFClient::OpenGL;
978 1065
979my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 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);
982 1073
983sub new { 1074sub new {
984 my $class = shift; 1075 my ($class, %arg) = @_;
985 1076
986 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
987 1078
988 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1082 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1083 can_events => 1,
994 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
995 ); 1087 );
996 1088
997 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
998 align => 0, 1090 align => 0,
999 valign => 1, 1091 valign => 1,
1000 text => $self->{title}, 1092 text => $title,
1001 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1002 1095
1003 $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};
1004} 1104}
1005 1105
1006sub border { 1106sub border {
1007 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1008} 1108}
1009 1109
1010sub size_request { 1110sub size_request {
1011 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1012 1115
1013 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1014 1117
1015 ( 1118 (
1016 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
1019} 1122}
1020 1123
1021sub size_allocate { 1124sub size_allocate {
1022 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
1023 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
1024 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1026 1137
1027 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028 if $self->{title};
1029
1030 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1031} 1139}
1032 1140
1033sub button_down { 1141sub button_down {
1034 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1035 1143
… …
1051 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1052 1160
1053 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1055 1163
1056 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1057 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
1058 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1059 $self->check_size; 1168 $self->realloc;
1060 }; 1169 };
1061 1170
1062 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1063 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1064 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1066 $self->{motion} = sub { 1175 $self->{motion} = sub {
1067 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1068 1177
1069 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1070 1179
1071 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1072 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1073 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1074 } 1188 1
1075} 1189}
1076 1190
1077sub button_up { 1191sub button_up {
1078 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1079 1193
1080 delete $self->{motion}; 1194 !!delete $self->{motion}
1081} 1195}
1082 1196
1083sub mouse_motion { 1197sub mouse_motion {
1084 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1085 1199
1086 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1087} 1203}
1088 1204
1089sub _draw { 1205sub _draw {
1090 my ($self) = @_; 1206 my ($self) = @_;
1091 1207
1208 my $child = $self->{children}[0];
1209
1092 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1093 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1094 1212
1095 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1096 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1097 1215
1098 my $border = $self->border; 1216 my $border = $self->border;
1099 1217
1100 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1101 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1102 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1103 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1104 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1105 1223
1106 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1107 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1108 1226
1109 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1110 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1111 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1112
1113 glColor @{ $self->{bg} };
1114
1115 $bg->{s} = $rep_x;
1116 $bg->{t} = $rep_y;
1117 $bg->{wrap_mode} = 1;
1118 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1119 } 1232 }
1120 1233
1121 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1122 1235
1123 $self->{title}->draw if $self->{title};
1124
1125 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1126} 1242}
1127 1243
1128############################################################################# 1244#############################################################################
1129 1245
1130package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1152 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1153 1269
1154 $child->set_parent ($self); 1270 $child->set_parent ($self);
1155 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1156 1272
1157 $self->check_size (1); 1273 $self->realloc;
1158} 1274}
1159 1275
1160# 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?
1161sub clear { 1277sub clear {
1162 my ($self) = @_; 1278 my ($self) = @_;
… …
1167 for (@children) { 1283 for (@children) {
1168 delete $_->{parent}; 1284 delete $_->{parent};
1169 $_->hide; 1285 $_->hide;
1170 } 1286 }
1171 1287
1172 $self->check_size (1); 1288 $self->realloc;
1173 $self->update;
1174} 1289}
1175 1290
1176sub get_wh { 1291sub get_wh {
1177 my ($self) = @_; 1292 my ($self) = @_;
1178 1293
… …
1274 } 1389 }
1275} 1390}
1276 1391
1277############################################################################# 1392#############################################################################
1278 1393
1279package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1280
1281# TODO: wrap into common Box base class
1282 1395
1283our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1284 1397
1285sub size_request { 1398sub size_request {
1286 my ($self) = @_; 1399 my ($self) = @_;
1287 1400
1288 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1289 1402 ? (
1290 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1291 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1292 (List::Util::max map $_->[1], @alloc), 1405 )
1293 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1294} 1410}
1295 1411
1296sub size_allocate { 1412sub size_allocate {
1297 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1298 1414
1299 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1300
1301 my $children = $self->{children}; 1416 my $children = $self->{children};
1302 1417
1303 my @h = map $_->{req_w}, @$children; 1418 my @req;
1304 1419
1305 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1306 1421 @req = ($space / (@$children || 1)) x @$children;
1307 if ($req_h > $h) {
1308 # ah well, not enough space
1309 $_ *= $h / $req_h for @h;
1310 } 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 {
1311 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1312 $exp ||= 1;
1313 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1314 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1315 my $child = $children->[$_];
1316
1317 my $alloc_h = $h[$_];
1318 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1319 $h[$_] = $alloc_h;
1320 } 1436 }
1321 } 1437 }
1322 1438
1323 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1324 1440
1325 my $y = 0; 1441 my $pos = 0;
1326 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1329 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1330 1445
1331 $y += $h; 1446 $pos += $alloc;
1332 } 1447 }
1333 1448
1334 1 1449 1
1335} 1450}
1336 1451
1337############################################################################# 1452#############################################################################
1338 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
1339package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1340 1470
1341# TODO: wrap into common Box base class
1342
1343our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1344 1472
1345sub size_request { 1473sub new {
1346 my ($self) = @_; 1474 my $class = shift;
1347 1475
1348 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1349 1477 vertical => 1,
1350 ( 1478 @_,
1351 (List::Util::max map $_->[0], @alloc),
1352 (List::Util::sum map $_->[1], @alloc),
1353 ) 1479 )
1354}
1355
1356sub size_allocate {
1357 my ($self, $w, $h) = @_;
1358
1359 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1360
1361 my $children = $self->{children};
1362
1363 my @h = map $_->{req_h}, @$children;
1364
1365 my $req_h = List::Util::sum @h;
1366
1367 if ($req_h > $h) {
1368 # ah well, not enough space
1369 $_ *= $h / $req_h for @h;
1370 } else {
1371 my $exp = List::Util::sum map $_->{expand}, @$children;
1372 $exp ||= 1;
1373
1374 for (0 .. $#$children) {
1375 my $child = $children->[$_];
1376
1377 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1378 }
1379 }
1380
1381 CFClient::UI::harmonize \@h;
1382
1383 my $y = 0;
1384 for (0 .. $#$children) {
1385 my $child = $children->[$_];
1386 my $h = $h[$_];
1387 $child->configure (0, $y, $w, $h);
1388
1389 $y += $h;
1390 }
1391
1392 1
1393} 1480}
1394 1481
1395############################################################################# 1482#############################################################################
1396 1483
1397package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1414 ellipsise => 3, # end 1501 ellipsise => 3, # end
1415 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1416 fontsize => 1, 1503 fontsize => 1,
1417 align => -1, 1504 align => -1,
1418 valign => -1, 1505 valign => -1,
1419 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1420 can_events => 0, 1508 can_events => 0,
1421 %arg 1509 %arg
1422 ); 1510 );
1423 1511
1424 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1460 $self->{text} = "T$text"; 1548 $self->{text} = "T$text";
1461 1549
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1551 $self->{layout}->set_text ($text);
1464 1552
1553 $self->realloc;
1465 $self->update; 1554 $self->update;
1466 $self->check_size;
1467} 1555}
1468 1556
1469sub set_markup { 1557sub set_markup {
1470 my ($self, $markup) = @_; 1558 my ($self, $markup) = @_;
1471 1559
… …
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1563 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1564
1477 $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;
1478 $self->{layout}->set_markup ($markup); 1566 $self->{layout}->set_markup ($markup);
1479 1567
1568 $self->realloc;
1480 $self->update; 1569 $self->update;
1481 $self->check_size;
1482} 1570}
1483 1571
1484sub size_request { 1572sub size_request {
1485 my ($self) = @_; 1573 my ($self) = @_;
1486 1574
… …
1500 1588
1501 $w = List::Util::max $w, $w2; 1589 $w = List::Util::max $w, $w2;
1502 $h = List::Util::max $h, $h2; 1590 $h = List::Util::max $h, $h2;
1503 } 1591 }
1504 1592
1505 ( 1593 ($w, $h)
1506 $w + $self->{padding} * 2,
1507 $h + $self->{padding} * 2,
1508 )
1509} 1594}
1510 1595
1511sub size_allocate { 1596sub size_allocate {
1512 my ($self, $w, $h) = @_; 1597 my ($self, $w, $h) = @_;
1513 1598
1599 delete $self->{ox};
1600
1514 delete $self->{texture}; 1601 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515} 1603}
1516 1604
1517sub set_fontsize { 1605sub set_fontsize {
1518 my ($self, $fontsize) = @_; 1606 my ($self, $fontsize) = @_;
1519 1607
1520 $self->{fontsize} = $fontsize; 1608 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1609 delete $self->{texture};
1522 1610
1523 $self->update; 1611 $self->realloc;
1524 $self->check_size;
1525} 1612}
1526 1613
1527sub _draw { 1614sub _draw {
1528 my ($self) = @_; 1615 my ($self) = @_;
1529 1616
… …
1535 $self->{layout}->set_width ($self->{w}); 1622 $self->{layout}->set_width ($self->{w});
1536 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1623 $self->{layout}->set_ellipsise ($self->{ellipsise});
1537 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539 1626
1540 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1627 new_from_layout CFClient::Texture $self->{layout}
1628 };
1541 1629
1630 unless (exists $self->{ox}) {
1542 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544 : ($self->{w} - $tex->{w}) * 0.5); 1633 : ($self->{w} - $tex->{w}) * 0.5);
1545 1634
1546 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548 : ($self->{h} - $tex->{h}) * 0.5); 1637 : ($self->{h} - $tex->{h}) * 0.5);
1549
1550 $tex
1551 }; 1638 };
1552 1639
1553 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1555 1642
… …
1593 1680
1594 delete $self->{cur_h}; 1681 delete $self->{cur_h};
1595 1682
1596 return if $self->{text} eq $text; 1683 return if $self->{text} eq $text;
1597 1684
1598 delete $self->{texture};
1599
1600 $self->{last_activity} = $::NOW; 1685 $self->{last_activity} = $::NOW;
1601 $self->{text} = $text; 1686 $self->{text} = $text;
1602 1687
1603 $text =~ s/./*/g if $self->{hidden}; 1688 $text =~ s/./*/g if $self->{hidden};
1604 $self->{layout}->set_text ("$text "); 1689 $self->{layout}->set_text ("$text ");
1605 1690
1606 $self->_emit (changed => $self->{text}); 1691 $self->_emit (changed => $self->{text});
1692 $self->update;
1607} 1693}
1608 1694
1609sub set_text { 1695sub set_text {
1610 my ($self, $text) = @_; 1696 my ($self, $text) = @_;
1611 1697
1612 $self->{cursor} = length $text; 1698 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1699 $self->_set_text ($text);
1614 $self->update; 1700
1615 $self->check_size; 1701 $self->realloc;
1616} 1702}
1617 1703
1618sub get_text { 1704sub get_text {
1619 $_[0]{text} 1705 $_[0]{text}
1620} 1706}
… …
1650 $self->{cursor} = length $text; 1736 $self->{cursor} = length $text;
1651 } elsif ($uni == 27) { 1737 } elsif ($uni == 27) {
1652 $self->_emit ('escape'); 1738 $self->_emit ('escape');
1653 } elsif ($uni) { 1739 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1740 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else {
1742 return 0;
1655 } 1743 }
1656 1744
1657 $self->_set_text ($text); 1745 $self->_set_text ($text);
1658 $self->update; 1746
1659 $self->check_size; 1747 $self->realloc;
1748
1749 1
1660} 1750}
1661 1751
1662sub focus_in { 1752sub focus_in {
1663 my ($self) = @_; 1753 my ($self) = @_;
1664 1754
… …
1679 utf8::encode $text; 1769 utf8::encode $text;
1680 $self->{cursor} = length substr $text, 0, $idx; 1770 $self->{cursor} = length substr $text, 0, $idx;
1681 1771
1682 $self->_set_text ($self->{text}); 1772 $self->_set_text ($self->{text});
1683 $self->update; 1773 $self->update;
1774
1775 1
1684} 1776}
1685 1777
1686sub mouse_motion { 1778sub mouse_motion {
1687 my ($self, $ev, $x, $y) = @_; 1779 my ($self, $ev, $x, $y) = @_;
1688# 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
1689} 1783}
1690 1784
1691sub _draw { 1785sub _draw {
1692 my ($self) = @_; 1786 my ($self) = @_;
1693 1787
1694 local $self->{fg} = $self->{fg}; 1788 local $self->{fg} = $self->{fg};
1695 1789
1696 if ($FOCUS == $self) { 1790 if ($FOCUS == $self) {
1697 glColor @{$self->{active_bg}}; 1791 glColor_premultiply @{$self->{active_bg}};
1698 $self->{fg} = $self->{active_fg}; 1792 $self->{fg} = $self->{active_fg};
1699 } else { 1793 } else {
1700 glColor @{$self->{bg}}; 1794 glColor_premultiply @{$self->{bg}};
1701 } 1795 }
1702 1796
1703 glEnable GL_BLEND; 1797 glEnable GL_BLEND;
1704 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1798 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1705 glBegin GL_QUADS; 1799 glBegin GL_QUADS;
1706 glVertex 0 , 0; 1800 glVertex 0 , 0;
1707 glVertex 0 , $self->{h}; 1801 glVertex 0 , $self->{h};
1708 glVertex $self->{w}, $self->{h}; 1802 glVertex $self->{w}, $self->{h};
1709 glVertex $self->{w}, 0; 1803 glVertex $self->{w}, 0;
… …
1770 } else { 1864 } else {
1771 $self->set_text ($self->{history_saveback}); 1865 $self->set_text ($self->{history_saveback});
1772 } 1866 }
1773 1867
1774 } else { 1868 } else {
1775 $self->SUPER::key_down ($ev); 1869 return $self->SUPER::key_down ($ev)
1870 }
1871
1776 } 1872 1
1777
1778} 1873}
1779 1874
1780############################################################################# 1875#############################################################################
1781 1876
1782package CFClient::UI::Button; 1877package CFClient::UI::Button;
… …
1791 1886
1792sub new { 1887sub new {
1793 my $class = shift; 1888 my $class = shift;
1794 1889
1795 $class->SUPER::new ( 1890 $class->SUPER::new (
1796 padding => 4, 1891 padding_x => 4,
1892 padding_y => 4,
1797 fg => [1, 1, 1], 1893 fg => [1, 1, 1],
1798 active_fg => [0, 0, 1], 1894 active_fg => [0, 0, 1],
1799 can_hover => 1, 1895 can_hover => 1,
1800 align => 0, 1896 align => 0,
1801 valign => 0, 1897 valign => 0,
… …
1810 my ($self, $ev, $x, $y) = @_; 1906 my ($self, $ev, $x, $y) = @_;
1811 1907
1812 $self->emit ("activate") 1908 $self->emit ("activate")
1813 if $x >= 0 && $x < $self->{w} 1909 if $x >= 0 && $x < $self->{w}
1814 && $y >= 0 && $y < $self->{h}; 1910 && $y >= 0 && $y < $self->{h};
1911
1912 1
1815} 1913}
1816 1914
1817sub _draw { 1915sub _draw {
1818 my ($self) = @_; 1916 my ($self) = @_;
1819 1917
… …
1848 1946
1849sub new { 1947sub new {
1850 my $class = shift; 1948 my $class = shift;
1851 1949
1852 $class->SUPER::new ( 1950 $class->SUPER::new (
1853 padding => 2, 1951 padding_x => 2,
1952 padding_y => 2,
1854 fg => [1, 1, 1], 1953 fg => [1, 1, 1],
1855 active_fg => [1, 1, 0], 1954 active_fg => [1, 1, 0],
1856 bg => [0, 0, 0, 0.2], 1955 bg => [0, 0, 0, 0.2],
1857 active_bg => [1, 1, 1, 0.5], 1956 active_bg => [1, 1, 1, 0.5],
1858 state => 0, 1957 state => 0,
… …
1862} 1961}
1863 1962
1864sub size_request { 1963sub size_request {
1865 my ($self) = @_; 1964 my ($self) = @_;
1866 1965
1867 ($self->{padding} * 2 + 6) x 2 1966 (6) x 2
1868} 1967}
1869 1968
1870sub button_down { 1969sub button_down {
1871 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1872 1971
1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875 $self->{state} = !$self->{state}; 1974 $self->{state} = !$self->{state};
1876 $self->_emit (changed => $self->{state}); 1975 $self->_emit (changed => $self->{state});
1976 } else {
1977 return 0
1978 }
1979
1877 } 1980 1
1878} 1981}
1879 1982
1880sub _draw { 1983sub _draw {
1881 my ($self) = @_; 1984 my ($self) = @_;
1882 1985
1883 $self->SUPER::_draw; 1986 $self->SUPER::_draw;
1884 1987
1885 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1988 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886 1989
1887 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;
1888 1993
1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1994 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890 1995
1891 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1996 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892 1997
… …
2047 2152
2048 my $h1 = $self->{h} * (1 - $ycut1); 2153 my $h1 = $self->{h} * (1 - $ycut1);
2049 my $h2 = $self->{h} * (1 - $ycut2); 2154 my $h2 = $self->{h} * (1 - $ycut2);
2050 2155
2051 glEnable GL_BLEND; 2156 glEnable GL_BLEND;
2052 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;
2053 glEnable GL_TEXTURE_2D; 2159 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 2161
2056 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2162 glBindTexture GL_TEXTURE_2D, $t1->{name};
2057 glBegin GL_QUADS; 2163 glBegin GL_QUADS;
… …
2157 fg => [1, 1, 1], 2263 fg => [1, 1, 1],
2158 active_fg => [0, 0, 0], 2264 active_fg => [0, 0, 0],
2159 bg => [0, 0, 0, 0.2], 2265 bg => [0, 0, 0, 0.2],
2160 active_bg => [1, 1, 1, 0.5], 2266 active_bg => [1, 1, 1, 0.5],
2161 range => [0, 0, 100, 10, 0], 2267 range => [0, 0, 100, 10, 0],
2162 req_w => $::WIDTH / 80, 2268 min_w => $::WIDTH / 80,
2163 req_h => $::WIDTH / 80, 2269 min_h => $::WIDTH / 80,
2164 vertical => 0, 2270 vertical => 0,
2165 can_hover => 1, 2271 can_hover => 1,
2166 inner_pad => 0.02, 2272 inner_pad => 0.02,
2167 @_ 2273 @_
2168 ); 2274 );
… …
2171 $self->update; 2277 $self->update;
2172 2278
2173 $self 2279 $self
2174} 2280}
2175 2281
2282sub changed { }
2283
2176sub set_range { 2284sub set_range {
2177 my ($self, $range) = @_; 2285 my ($self, $range) = @_;
2178 2286
2179 ($range, $self->{range}) = ($self->{range}, $range); 2287 ($range, $self->{range}) = ($self->{range}, $range);
2180 2288
… …
2206} 2314}
2207 2315
2208sub size_request { 2316sub size_request {
2209 my ($self) = @_; 2317 my ($self) = @_;
2210 2318
2211 my $w = $self->{req_w}; 2319 ($self->{req_w}, $self->{req_h})
2212 my $h = $self->{req_h};
2213
2214 $self->{vertical} ? ($h, $w) : ($w, $h)
2215} 2320}
2216 2321
2217sub button_down { 2322sub button_down {
2218 my ($self, $ev, $x, $y) = @_; 2323 my ($self, $ev, $x, $y) = @_;
2219 2324
2220 $self->SUPER::button_down ($ev, $x, $y); 2325 $self->SUPER::button_down ($ev, $x, $y);
2221 2326
2222 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223 2328
2224 $self->mouse_motion ($ev, $x, $y); 2329 $self->mouse_motion ($ev, $x, $y)
2225} 2330}
2226 2331
2227sub mouse_motion { 2332sub mouse_motion {
2228 my ($self, $ev, $x, $y) = @_; 2333 my ($self, $ev, $x, $y) = @_;
2229 2334
… …
2233 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2338 my (undef, $lo, $hi, $page) = @{$self->{range}};
2234 2339
2235 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2340 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236 2341
2237 $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
2238 } 2347 1
2239} 2348}
2240 2349
2241sub update { 2350sub update {
2242 my ($self) = @_; 2351 my ($self) = @_;
2243 2352
2244 $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}) {
2245 $self->set_value ($self->{range}[0]); 2361 $self->set_value ($self->{range}[0]);
2246 2362
2247 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2363 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100; 2364 my $range = ($hi - $page - $lo) || 1e-100;
2249 2365
… …
2255 $value = ($value - $lo) / $range; 2371 $value = ($value - $lo) / $range;
2256 $value = $value * $self->{scale} + $self->{offset}; 2372 $value = $value * $self->{scale} + $self->{offset};
2257 2373
2258 $self->{knob_x} = $value - $knob_w * 0.5; 2374 $self->{knob_x} = $value - $knob_w * 0.5;
2259 $self->{knob_w} = $knob_w; 2375 $self->{knob_w} = $knob_w;
2260 }); 2376 }
2261
2262 $self->SUPER::update;
2263}
2264
2265sub _draw {
2266 my ($self) = @_;
2267 2377
2268 $self->SUPER::_draw (); 2378 $self->SUPER::_draw ();
2269 2379
2270 glScale $self->{w}, $self->{h}; 2380 glScale $self->{w}, $self->{h};
2271 2381
… …
2570 2680
2571sub new { 2681sub new {
2572 my $class = shift; 2682 my $class = shift;
2573 2683
2574 my $self = $class->SUPER::new ( 2684 my $self = $class->SUPER::new (
2575 state => 0, 2685 state => 0,
2576 connect_activate => \&toggle_flopper, 2686 on_activate => \&toggle_flopper,
2577 @_ 2687 @_
2578 ); 2688 );
2579 2689
2580 if ($self->{state}) {
2581 $self->{state} = 0;
2582 $self->toggle_flopper;
2583 }
2584
2585 $self 2690 $self
2586} 2691}
2587 2692
2588sub toggle_flopper { 2693sub toggle_flopper {
2589 my ($self) = @_; 2694 my ($self) = @_;
2590 2695
2591 # TODO: use animation 2696 $self->{other}->toggle_visibility;
2592 if ($self->{state} = !$self->{state}) {
2593 $CFClient::UI::ROOT->add ($self->{other});
2594 $self->{other}->move ($self->coord2global (0, $self->{h}));
2595 $self->_emit ("open");
2596 } else {
2597 $CFClient::UI::ROOT->remove ($self->{other});
2598 $self->_emit ("close");
2599 }
2600
2601 $self->_emit (changed => $self->{state});
2602} 2697}
2603 2698
2604############################################################################# 2699#############################################################################
2605 2700
2606package CFClient::UI::Tooltip; 2701package CFClient::UI::Tooltip;
… …
2619} 2714}
2620 2715
2621sub set_tooltip_from { 2716sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2717 my ($self, $widget) = @_;
2623 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
2624 $self->add (new CFClient::UI::Label 2728 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2729 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2731 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2732 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2733 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2734 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2641 2745
2642sub size_allocate { 2746sub size_allocate {
2643 my ($self, $w, $h) = @_; 2747 my ($self, $w, $h) = @_;
2644 2748
2645 $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 });
2646} 2768}
2647 2769
2648sub _draw { 2770sub _draw {
2649 my ($self) = @_; 2771 my ($self) = @_;
2650 2772
… …
2667 glVertex $w, $h; 2789 glVertex $w, $h;
2668 glVertex $w, 0; 2790 glVertex $w, 0;
2669 glEnd; 2791 glEnd;
2670 2792
2671 glTranslate 2 - 0.375, 2 - 0.375; 2793 glTranslate 2 - 0.375, 2 - 0.375;
2794
2672 $self->SUPER::_draw; 2795 $self->SUPER::_draw;
2673} 2796}
2674 2797
2675############################################################################# 2798#############################################################################
2676 2799
… …
2752 $self->SUPER::DESTROY; 2875 $self->SUPER::DESTROY;
2753} 2876}
2754 2877
2755############################################################################# 2878#############################################################################
2756 2879
2757package CFClient::UI::Inventory; 2880package CFClient::UI::Buttonbar;
2758 2881
2759our @ISA = CFClient::UI::ScrolledWindow::; 2882our @ISA = CFClient::UI::HBox::;
2760 2883
2761sub new { 2884# TODO: should actualyl wrap buttons and other goodies.
2762 my $class = shift;
2763
2764 my $self = $class->SUPER::new (
2765 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2766 @_,
2767 );
2768
2769 $self
2770}
2771
2772sub set_items {
2773 my ($self, $items) = @_;
2774
2775 $self->{scrolled}->clear;
2776 return unless $items;
2777
2778 my @items = sort {
2779 ($a->{type} <=> $b->{type})
2780 or ($a->{name} cmp $b->{name})
2781 } @$items;
2782
2783 $self->{real_items} = \@items;
2784
2785 my $row = 0;
2786 for my $item (@items) {
2787 CFClient::Item::update_widgets $item;
2788
2789 $self->{scrolled}->add (0, $row, $item->{face_widget});
2790 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2791 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2792
2793 $row++;
2794 }
2795}
2796
2797sub size_request {
2798 my ($self) = @_;
2799 ($self->{req_w}, $self->{req_h});
2800}
2801 2885
2802############################################################################# 2886#############################################################################
2803 2887
2804package CFClient::UI::Menu; 2888package CFClient::UI::Menu;
2805 2889
… …
2846 # maybe save $GRAB? must be careful about events... 2930 # maybe save $GRAB? must be careful about events...
2847 $GRAB = $self; 2931 $GRAB = $self;
2848 $self->{button} = $ev->{button}; 2932 $self->{button} = $ev->{button};
2849 2933
2850 $self->show; 2934 $self->show;
2851 $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);
2852} 2936}
2853 2937
2854sub mouse_motion { 2938sub mouse_motion {
2855 my ($self, $ev, $x, $y) = @_; 2939 my ($self, $ev, $x, $y) = @_;
2856 2940
2857 # TODO: should use vbox->find_widget or so 2941 # TODO: should use vbox->find_widget or so
2858 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2859 $self->{hover} = $self->{item}{$HOVER}; 2943 $self->{hover} = $self->{item}{$HOVER};
2944
2945 0
2860} 2946}
2861 2947
2862sub button_up { 2948sub button_up {
2863 my ($self, $ev, $x, $y) = @_; 2949 my ($self, $ev, $x, $y) = @_;
2864 2950
… …
2866 undef $GRAB; 2952 undef $GRAB;
2867 $self->hide; 2953 $self->hide;
2868 2954
2869 $self->_emit ("popdown"); 2955 $self->_emit ("popdown");
2870 $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 );
2871 } 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});
2872} 3070}
2873 3071
2874############################################################################# 3072#############################################################################
2875 3073
2876package CFClient::UI::Statusbox; 3074package CFClient::UI::Statusbox;
… …
2981 $self->SUPER::reconfigure; 3179 $self->SUPER::reconfigure;
2982} 3180}
2983 3181
2984############################################################################# 3182#############################################################################
2985 3183
2986package CFClient::UI::Root; 3184package CFClient::UI::Inventory;
2987 3185
2988our @ISA = CFClient::UI::Container::; 3186our @ISA = CFClient::UI::ScrolledWindow::;
2989
2990use CFClient::OpenGL;
2991 3187
2992sub new { 3188sub new {
2993 my $class = shift; 3189 my $class = shift;
2994 3190
2995 $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 => [],
3433 @_,
3434 )
3435}
3436
3437# XXX: Do sorting? Argl...
3438sub add_spell {
3439 my ($self, $spell) = @_;
3440 $self->{spells}->{$spell->{name}} = $spell;
3441
3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
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 (
2996 visible => 1, 3489 visible => 1,
2997 @_, 3490 @_,
2998 ) 3491 );
2999}
3000 3492
3001sub configure { 3493 Scalar::Util::weaken ($self->{root} = $self);
3002 my ($self, $x, $y, $w, $h) = @_;
3003 3494
3004 $self->{w} = $w; 3495 $self
3005 $self->{h} = $h;
3006}
3007
3008sub check_size {
3009 my ($self) = @_;
3010
3011 $self->size_allocate ($self->{w}, $self->{h})
3012 if $self->{w};
3013} 3496}
3014 3497
3015sub size_request { 3498sub size_request {
3016 my ($self) = @_; 3499 my ($self) = @_;
3017 3500
3018 ($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
3019} 3516}
3020 3517
3021sub size_allocate { 3518sub size_allocate {
3022 my ($self, $w, $h) = @_; 3519 my ($self, $w, $h) = @_;
3023 3520
3024 for my $child ($self->children) { 3521 for my $child ($self->children) {
3025 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)};
3026 3523
3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3524 $X = $child->{force_x} if exists $child->{force_x};
3028 if exists $child->{req_x}; 3525 $Y = $child->{force_y} if exists $child->{force_y};
3029 3526
3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3527 $X = _to_pixel $X, $W, $self->{w};
3031 if exists $child->{req_y}; 3528 $Y = _to_pixel $Y, $H, $self->{h};
3032
3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035 3529
3036 $child->configure ($X, $Y, $W, $H); 3530 $child->configure ($X, $Y, $W, $H);
3037 } 3531 }
3038} 3532}
3039 3533
… …
3050} 3544}
3051 3545
3052sub update { 3546sub update {
3053 my ($self) = @_; 3547 my ($self) = @_;
3054 3548
3055 $self->check_size;
3056 $::WANT_REFRESH++; 3549 $::WANT_REFRESH++;
3057} 3550}
3058 3551
3059sub add { 3552sub add {
3060 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
3061 3554
3062 for (my @widgets = @children; my $w = pop @widgets; ) {
3063 push @widgets, $w->children;
3064 $w->{root} = $self;
3065 $w->{visible} = $self->{visible} + 1;
3066 }
3067
3068 for my $child (@children) {
3069 $child->{is_toplevel} = 1; 3555 $_->{is_toplevel} = 1
3070 3556 for @children;
3071 # integerise window positions
3072 $child->{x} = int $child->{x};
3073 $child->{y} = int $child->{y};
3074 }
3075 3557
3076 $self->SUPER::add (@children); 3558 $self->SUPER::add (@children);
3077} 3559}
3078 3560
3079sub remove { 3561sub remove {
3080 my ($self, @children) = @_; 3562 my ($self, @children) = @_;
3081 3563
3082 $self->SUPER::remove (@children); 3564 $self->SUPER::remove (@children);
3565
3566 delete $self->{is_toplevel}
3567 for @children;
3083 3568
3084 while (@children) { 3569 while (@children) {
3085 my $w = pop @children; 3570 my $w = pop @children;
3086 push @children, $w->children; 3571 push @children, $w->children;
3087 $w->set_invisible; 3572 $w->set_invisible;
… …
3106 while ($self->{refresh_hook}) { 3591 while ($self->{refresh_hook}) {
3107 $_->() 3592 $_->()
3108 for values %{delete $self->{refresh_hook}}; 3593 for values %{delete $self->{refresh_hook}};
3109 } 3594 }
3110 3595
3111 if ($self->{check_size}) { 3596 if ($self->{realloc}) {
3112 my @queue = ([], []); 3597 my %queue;
3598 my @queue;
3599 my $widget;
3113 3600
3114 for (;;) { 3601 outer:
3115 if ($self->{check_size}) { 3602 while () {
3116 # heuristic: check containers last 3603 if (my $realloc = delete $self->{realloc}) {
3117 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3604 for $widget (values %$realloc) {
3118 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 }
3119 } 3611 }
3120 3612
3121 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3613 while () {
3614 @queue or last outer;
3122 3615
3123 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3616 $widget = pop @{ $queue[-1] || [] }
3124 ? @$widget{qw(user_w user_h)} 3617 and last;
3125 : $widget->size_request;
3126
3127 if (delete $widget->{force_alloc}
3128 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3129 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3130 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}) {
3131 $widget->{req_w} = $w; 3634 $widget->{req_w} = $w;
3132 $widget->{req_h} = $h; 3635 $widget->{req_h} = $h;
3133 3636
3134 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3637 $self->{size_alloc}{$widget+0} = $widget;
3135 3638
3136 $widget->{parent}->check_size
3137 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 }
3138 } 3646 }
3647
3648 delete $self->{realloc}{$widget+0};
3139 } 3649 }
3140 } 3650 }
3141 3651
3142 while ($self->{size_alloc}) { 3652 while (my $size_alloc = delete $self->{size_alloc}) {
3143 for (values %{delete $self->{size_alloc}}) { 3653 my @queue = sort { $b->{visible} <=> $a->{visible} }
3144 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)};
3145 3660
3146 $w = 0 if $w < 0; 3661 $w = 0 if $w < 0;
3147 $h = 0 if $h < 0; 3662 $h = 0 if $h < 0;
3148 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
3149 $widget->{w} = $w; 3671 $widget->{w} = $w;
3150 $widget->{h} = $h; 3672 $widget->{h} = $h;
3673
3151 $widget->emit (size_allocate => $w, $h); 3674 $widget->emit (size_allocate => $w, $h);
3675 }
3152 } 3676 }
3153 } 3677 }
3154 3678
3155 while ($self->{post_alloc_hook}) { 3679 while ($self->{post_alloc_hook}) {
3156 $_->() 3680 $_->()
3157 for values %{delete $self->{post_alloc_hook}}; 3681 for values %{delete $self->{post_alloc_hook}};
3158 } 3682 }
3683
3159 3684
3160 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3685 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3161 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3686 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3162 glClear GL_COLOR_BUFFER_BIT; 3687 glClear GL_COLOR_BUFFER_BIT;
3163 3688
… …
3165 glLoadIdentity; 3690 glLoadIdentity;
3166 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3167 glMatrixMode GL_MODELVIEW; 3692 glMatrixMode GL_MODELVIEW;
3168 glLoadIdentity; 3693 glLoadIdentity;
3169 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
3170 $self->_draw; 3702 $self->_draw;
3171} 3703}
3172 3704
3173############################################################################# 3705#############################################################################
3174 3706

Diff Legend

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