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.244 by root, Sat May 27 21:06:09 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;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 217
210 for (keys %$self) { 218 for (keys %$self) {
211 if (/^on_(.*)$/) { 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 return unless $self->{visible}; 272 return unless $self->{visible};
259 273
260 # broken show/hide model 274 $_->set_invisible for $self->children;
261 275
262 delete $self->{root}; 276 delete $self->{root};
263 delete $self->{visible}; 277 delete $self->{visible};
264 278
265 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
266 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
267 281
268 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
269 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
270 284
271 $self->focus_out; 285 $self->focus_out;
272 286
273 $self->emit (visibility_change => 0); 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;
274} 305}
275 306
276sub hide { 307sub hide {
277 my ($self) = @_; 308 my ($self) = @_;
278 309
… …
280 311
281 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
282 if $self->{parent}; 313 if $self->{parent};
283} 314}
284 315
285sub move { 316sub move_abs {
286 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
287 318
288 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
289 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
290 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
291 322
292 $self->update; 323 $self->update;
293} 324}
294 325
295sub set_size { 326sub set_size {
296 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
297 328
298 $self->{user_w} = $w; 329 $self->{force_w} = $w;
299 $self->{user_h} = $h; 330 $self->{force_h} = $h;
300 331
301 $self->check_size; 332 $self->realloc;
302} 333}
303 334
304sub size_request { 335sub size_request {
305 require Carp; 336 require Carp;
306 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
308 339
309sub configure { 340sub configure {
310 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
311 342
312 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
313 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
314 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
315 348
316 # use alignment to adjust x, y 349 # use alignment to adjust x, y
317 350
318 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
319 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
320
321 ($w, $h) = ($w2, $h2);
322 } 353 }
323 354
324 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
325 $self->{x} = $x; 356 $self->{x} = $x;
326 $self->{y} = $y; 357 $self->{y} = $y;
327 $self->update; 358 $self->update;
328 } 359 }
329 360
330 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
331 $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;
332 } 368 }
333} 369}
334 370
335sub size_allocate { 371sub size_allocate {
336 # nothing to be done 372 # nothing to be done
337} 373}
338 374
339sub reconfigure {
340 my ($self) = @_;
341
342 $self->check_size (1);
343 $self->update;
344}
345
346sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
347} 381}
348 382
349sub set_max_size { 383sub set_max_size {
350 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
351 385
… …
410 444
411 $::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
412 unless $FOCUS; 446 unless $FOCUS;
413} 447}
414 448
415sub mouse_motion { } 449sub mouse_motion { 0 }
416sub button_up { } 450sub button_up { 0 }
417sub key_down { } 451sub key_down { 0 }
418sub key_up { } 452sub key_up { 0 }
419 453
420sub button_down { 454sub button_down {
421 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
422 456
423 $self->focus_in; 457 $self->focus_in;
424}
425 458
426sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
427sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
428sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
429sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
430sub 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
431 535
432sub draw { 536sub draw {
433 my ($self) = @_; 537 my ($self) = @_;
434 538
435 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);
436 550
437 glPushMatrix; 551 glPushMatrix;
438 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
439 $self->_draw;
440 glPopMatrix;
441 553
442 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
443 my ($x, $y) = @$self{qw(x y)};
444
445 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
446 glEnable GL_BLEND; 556 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
448 glBegin GL_QUADS; 558 glBegin GL_QUADS;
449 glVertex $x , $y; 559 glVertex 0 , 0;
450 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
451 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
452 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
453 glEnd; 563 glEnd;
454 glDisable GL_BLEND; 564 glDisable GL_BLEND;
455 } 565 }
456 566
457 if ($ENV{PCLIENT_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
458 glPushMatrix; 568 glPushMatrix;
459 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
460 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
461 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
462 glVertex 0 , 0; 572 glVertex 0 , 0;
463 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
464 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
465 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
466 glEnd; 576 glEnd;
467 glPopMatrix; 577 glPopMatrix;
468 #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;
469 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
470} 583}
471 584
472sub _draw { 585sub _draw {
473 my ($self) = @_; 586 my ($self) = @_;
474 587
475 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
476}
477
478sub find_widget {
479 my ($self, $x, $y) = @_;
480
481 return () unless $self->{can_events};
482
483 return $self
484 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
485 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
486
487 ()
488}
489
490sub set_parent {
491 my ($self, $parent) = @_;
492
493 Scalar::Util::weaken ($self->{parent} = $parent);
494
495 if ($parent->{visible} || 1) {
496 $self->{root} = $parent->{root};
497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
502
503 # TODO: req_w _does_change after ->reconfigure
504 $self->check_size
505 unless exists $self->{req_w};
506
507 $self->show;
508}
509
510sub check_size {
511 my ($self, $forced) = @_;
512
513 $self->{force_alloc} = 1 if $forced;
514 $CFClient::UI::ROOT->{check_size}{$self} = $self;
515}
516
517sub update {
518 my ($self) = @_;
519
520 $self->{parent}->update
521 if $self->{parent};
522}
523
524sub connect {
525 my ($self, $signal, $cb) = @_;
526
527 push @{ $self->{signal_cb}{$signal} }, $cb;
528}
529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
536sub emit {
537 my ($self, $signal, @args) = @_;
538
539 $self->_emit ($signal, @args)
540 || $self->$signal (@args);
541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
545} 589}
546 590
547sub DESTROY { 591sub DESTROY {
548 my ($self) = @_; 592 my ($self) = @_;
549 593
… …
581 625
582 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
583 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
584 628
585 glEnable GL_BLEND; 629 glEnable GL_BLEND;
586 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
587 glColor @$color; 631 glColor_premultiply @$color;
588 632
589 glBegin GL_QUADS; 633 glBegin GL_QUADS;
590 glVertex 0 , 0; 634 glVertex 0 , 0;
591 glVertex 0 , $h; 635 glVertex 0 , $h;
592 glVertex $w, $h; 636 glVertex $w, $h;
… …
607 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
608 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
609} 653}
610 654
611sub size_request { 655sub size_request {
612 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
613} 659}
614 660
615sub draw { } 661sub draw { }
616 662
617############################################################################# 663#############################################################################
… …
621our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
622 668
623sub new { 669sub new {
624 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
625 671
626 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
627 673
628 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
629 children => [], 675 children => [],
630 can_events => 0, 676 can_events => 0,
631 %arg, 677 %arg,
632 ); 678 );
679
633 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
634 682
635 $self 683 $self
636} 684}
637 685
638sub add { 686sub add {
… …
646 $self->{children} = [ 694 $self->{children} = [
647 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
648 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
649 ]; 697 ];
650 698
651 $self->check_size (1); 699 $self->realloc;
652 $self->update;
653} 700}
654 701
655sub children { 702sub children {
656 @{ $_[0]{children} } 703 @{ $_[0]{children} }
657} 704}
… …
662 delete $child->{parent}; 709 delete $child->{parent};
663 $child->hide; 710 $child->hide;
664 711
665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
666 713
667 $self->check_size (1); 714 $self->realloc;
668 $self->update;
669} 715}
670 716
671sub clear { 717sub clear {
672 my ($self) = @_; 718 my ($self) = @_;
673 719
… …
677 for (@$children) { 723 for (@$children) {
678 delete $_->{parent}; 724 delete $_->{parent};
679 $_->hide; 725 $_->hide;
680 } 726 }
681 727
682 $self->check_size; 728 $self->realloc;
683 $self->update;
684} 729}
685 730
686sub find_widget { 731sub find_widget {
687 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
688 733
689 $x -= $self->{x}; 734 $x -= $self->{x};
690 $y -= $self->{y}; 735 $y -= $self->{y};
691 736
692 my $res; 737 my $res;
693 738
694 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
695 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
696 and return $res; 741 and return $res;
697 } 742 }
698 743
699 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
748 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
749} 794}
750 795
751############################################################################# 796#############################################################################
752 797
798# back-buffered drawing area
799
753package CFClient::UI::Window; 800package CFClient::UI::Window;
754 801
755our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
756 803
757use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
775 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
776 $self->update; 823 $self->update;
777} 824}
778 825
779sub _render { 826sub _render {
827 my ($self) = @_;
828
780 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
781} 830}
782 831
783sub render_child { 832sub render_child {
784 my ($self) = @_; 833 my ($self) = @_;
785 834
786 $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 {
787 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
788 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
789 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
790 $self->_render; 846 $self->_render;
791 }; 847 };
792} 848}
793 849
794sub _draw { 850sub _draw {
795 my ($self) = @_; 851 my ($self) = @_;
796 852
797 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
798 854
799 my $tex = $self->{texture} 855 my $tex = $self->{texture}
800 or return; 856 or return;
801 857
802 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
803 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;
804 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
805 863
806 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad (0, 0, $w, $h);
807 865
866 glDisable GL_BLEND;
808 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
809} 868}
810 869
811############################################################################# 870#############################################################################
812 871
… …
825} 884}
826 885
827sub size_request { 886sub size_request {
828 my ($self) = @_; 887 my ($self) = @_;
829 888
830 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
831 890
832 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
833} 895}
834 896
835sub size_allocate { 897sub size_allocate {
836 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
837 899
900 my $child = $self->child;
901
838 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
839 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
840 904
841 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
842 $self->update; 906 $self->update;
843} 907}
844 908
… …
880} 944}
881 945
882sub _render { 946sub _render {
883 my ($self) = @_; 947 my ($self) = @_;
884 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
885 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
886 953
887 $self->SUPER::_render; 954 $self->SUPER::_render;
888} 955}
889 956
… …
892package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
893 960
894our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
895 962
896sub new { 963sub new {
897 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
898 967
899 my $self; 968 my $self;
900 969
901 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
902 vertical => 1, 971 vertical => 1,
… …
907 ; 976 ;
908 977
909 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
910 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
911 slider => $slider, 980 slider => $slider,
912 @_, 981 %arg,
913 ); 982 );
914 983
915 $self->{vp}->add ($self->{scrolled});
916 $self->add ($self->{vp});
917 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
918 986
919 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
920} 994}
921 995
922sub update { 996sub update {
923 my ($self) = @_; 997 my ($self) = @_;
924 998
… …
963 1037
964 if ($self->{bg}) { 1038 if ($self->{bg}) {
965 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
966 1040
967 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
968 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
969 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
970 1044
971 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
972 glVertex 0 , 0; 1046 glVertex 0 , 0;
973 glVertex 0 , $h; 1047 glVertex 0 , $h;
974 glVertex $w, $h; 1048 glVertex $w, $h;
… …
987 1061
988our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
989 1063
990use CFClient::OpenGL; 1064use CFClient::OpenGL;
991 1065
992my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
994 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);
995 1073
996sub new { 1074sub new {
997 my $class = shift; 1075 my ($class, %arg) = @_;
998 1076
999 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
1000 1078
1001 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1002 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1003 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1004 border => 0.6, 1082 border => 0.6,
1005 is_toplevel => 1,
1006 can_events => 1, 1083 can_events => 1,
1007 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
1008 ); 1087 );
1009 1088
1010 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1011 align => 0, 1090 align => 0,
1012 valign => 1, 1091 valign => 1,
1013 text => $self->{title}, 1092 text => $title,
1014 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1015 1095
1016 $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};
1017} 1104}
1018 1105
1019sub border { 1106sub border {
1020 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1021} 1108}
1022 1109
1023sub size_request { 1110sub size_request {
1024 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1025 1115
1026 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1027 1117
1028 ( 1118 (
1029 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
1032} 1122}
1033 1123
1034sub size_allocate { 1124sub size_allocate {
1035 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
1036 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
1037 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1038 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1039 1137
1040 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1041 if $self->{title};
1042
1043 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1044} 1139}
1045 1140
1046sub button_down { 1141sub button_down {
1047 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1048 1143
… …
1064 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1065 1160
1066 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1067 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1068 1163
1069 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my;
1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1073 $self->move ($self->{user_x}, $self->{user_y}); 1166
1074 $self->check_size; 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
1075 }; 1169 };
1076 1170
1077 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1078 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1079 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1081 $self->{motion} = sub { 1175 $self->{motion} = sub {
1082 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1083 1177
1084 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1085 1179
1086 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1087 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1088 $self->move ($self->{user_x}, $self->{user_y}); 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1089 $self->update;
1090 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1091 } 1188 1
1092} 1189}
1093 1190
1094sub button_up { 1191sub button_up {
1095 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1096 1193
1097 delete $self->{motion}; 1194 !!delete $self->{motion}
1098} 1195}
1099 1196
1100sub mouse_motion { 1197sub mouse_motion {
1101 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1102 1199
1103 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1104} 1203}
1105 1204
1106sub _draw { 1205sub _draw {
1107 my ($self) = @_; 1206 my ($self) = @_;
1108 1207
1208 my $child = $self->{children}[0];
1209
1109 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1110 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1111 1212
1112 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1114 1215
1115 my $border = $self->border; 1216 my $border = $self->border;
1116 1217
1117 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1118 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1119 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1120 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1121 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1122 1223
1123 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1124 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1125 1226
1126 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1127 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1128 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1129
1130 glColor @{ $self->{bg} };
1131
1132 $bg->{s} = $rep_x;
1133 $bg->{t} = $rep_y;
1134 $bg->{wrap_mode} = 1;
1135 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136 } 1232 }
1137 1233
1138 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1139 1235
1140 $self->{title}->draw if $self->{title};
1141
1142 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1143} 1242}
1144 1243
1145############################################################################# 1244#############################################################################
1146 1245
1147package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1169 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1170 1269
1171 $child->set_parent ($self); 1270 $child->set_parent ($self);
1172 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1173 1272
1174 $self->check_size (1); 1273 $self->realloc;
1175} 1274}
1176 1275
1177# 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?
1178sub clear { 1277sub clear {
1179 my ($self) = @_; 1278 my ($self) = @_;
… …
1184 for (@children) { 1283 for (@children) {
1185 delete $_->{parent}; 1284 delete $_->{parent};
1186 $_->hide; 1285 $_->hide;
1187 } 1286 }
1188 1287
1189 $self->check_size (1); 1288 $self->realloc;
1190 $self->update;
1191} 1289}
1192 1290
1193sub get_wh { 1291sub get_wh {
1194 my ($self) = @_; 1292 my ($self) = @_;
1195 1293
… …
1291 } 1389 }
1292} 1390}
1293 1391
1294############################################################################# 1392#############################################################################
1295 1393
1296package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1297
1298# TODO: wrap into common Box base class
1299 1395
1300our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1301 1397
1302sub size_request { 1398sub size_request {
1303 my ($self) = @_; 1399 my ($self) = @_;
1304 1400
1305 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1306 1402 ? (
1307 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1308 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1309 (List::Util::max map $_->[1], @alloc), 1405 )
1310 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1311} 1410}
1312 1411
1313sub size_allocate { 1412sub size_allocate {
1314 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1315 1414
1316 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1317
1318 my $children = $self->{children}; 1416 my $children = $self->{children};
1319 1417
1320 my @h = map $_->{req_w}, @$children; 1418 my @req;
1321 1419
1322 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1323 1421 @req = ($space / (@$children || 1)) x @$children;
1324 if ($req_h > $h) {
1325 # ah well, not enough space
1326 $_ *= $h / $req_h for @h;
1327 } 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 {
1328 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1329 $exp ||= 1;
1330 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1331 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1332 my $child = $children->[$_];
1333
1334 my $alloc_h = $h[$_];
1335 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1336 $h[$_] = $alloc_h;
1337 } 1436 }
1338 } 1437 }
1339 1438
1340 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1341 1440
1342 my $y = 0; 1441 my $pos = 0;
1343 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1346 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1347 1445
1348 $y += $h; 1446 $pos += $alloc;
1349 } 1447 }
1350 1448
1351 1 1449 1
1352} 1450}
1353 1451
1354############################################################################# 1452#############################################################################
1355 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
1356package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1357 1470
1358# TODO: wrap into common Box base class
1359
1360our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1361 1472
1362sub size_request { 1473sub new {
1363 my ($self) = @_; 1474 my $class = shift;
1364 1475
1365 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1366 1477 vertical => 1,
1367 ( 1478 @_,
1368 (List::Util::max map $_->[0], @alloc),
1369 (List::Util::sum map $_->[1], @alloc),
1370 ) 1479 )
1371}
1372
1373sub size_allocate {
1374 my ($self, $w, $h) = @_;
1375
1376 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1377
1378 my $children = $self->{children};
1379
1380 my @h = map $_->{req_h}, @$children;
1381
1382 my $req_h = List::Util::sum @h;
1383
1384 if ($req_h > $h) {
1385 # ah well, not enough space
1386 $_ *= $h / $req_h for @h;
1387 } else {
1388 my $exp = List::Util::sum map $_->{expand}, @$children;
1389 $exp ||= 1;
1390
1391 for (0 .. $#$children) {
1392 my $child = $children->[$_];
1393
1394 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1395 }
1396 }
1397
1398 CFClient::UI::harmonize \@h;
1399
1400 my $y = 0;
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403 my $h = $h[$_];
1404 $child->configure (0, $y, $w, $h);
1405
1406 $y += $h;
1407 }
1408
1409 1
1410} 1480}
1411 1481
1412############################################################################# 1482#############################################################################
1413 1483
1414package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1431 ellipsise => 3, # end 1501 ellipsise => 3, # end
1432 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1433 fontsize => 1, 1503 fontsize => 1,
1434 align => -1, 1504 align => -1,
1435 valign => -1, 1505 valign => -1,
1436 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1437 can_events => 0, 1508 can_events => 0,
1438 %arg 1509 %arg
1439 ); 1510 );
1440 1511
1441 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1477 $self->{text} = "T$text"; 1548 $self->{text} = "T$text";
1478 1549
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1551 $self->{layout}->set_text ($text);
1481 1552
1553 $self->realloc;
1482 $self->update; 1554 $self->update;
1483 $self->check_size;
1484} 1555}
1485 1556
1486sub set_markup { 1557sub set_markup {
1487 my ($self, $markup) = @_; 1558 my ($self, $markup) = @_;
1488 1559
… …
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1563 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1564
1494 $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;
1495 $self->{layout}->set_markup ($markup); 1566 $self->{layout}->set_markup ($markup);
1496 1567
1568 $self->realloc;
1497 $self->update; 1569 $self->update;
1498 $self->check_size;
1499} 1570}
1500 1571
1501sub size_request { 1572sub size_request {
1502 my ($self) = @_; 1573 my ($self) = @_;
1503 1574
… …
1517 1588
1518 $w = List::Util::max $w, $w2; 1589 $w = List::Util::max $w, $w2;
1519 $h = List::Util::max $h, $h2; 1590 $h = List::Util::max $h, $h2;
1520 } 1591 }
1521 1592
1522 ( 1593 ($w, $h)
1523 $w + $self->{padding} * 2,
1524 $h + $self->{padding} * 2,
1525 )
1526} 1594}
1527 1595
1528sub size_allocate { 1596sub size_allocate {
1529 my ($self, $w, $h) = @_; 1597 my ($self, $w, $h) = @_;
1530 1598
1599 delete $self->{ox};
1600
1531 delete $self->{texture}; 1601 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1532} 1603}
1533 1604
1534sub set_fontsize { 1605sub set_fontsize {
1535 my ($self, $fontsize) = @_; 1606 my ($self, $fontsize) = @_;
1536 1607
1537 $self->{fontsize} = $fontsize; 1608 $self->{fontsize} = $fontsize;
1538 delete $self->{texture}; 1609 delete $self->{texture};
1539 1610
1540 $self->update; 1611 $self->realloc;
1541 $self->check_size;
1542} 1612}
1543 1613
1544sub _draw { 1614sub _draw {
1545 my ($self) = @_; 1615 my ($self) = @_;
1546 1616
… …
1552 $self->{layout}->set_width ($self->{w}); 1622 $self->{layout}->set_width ($self->{w});
1553 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1623 $self->{layout}->set_ellipsise ($self->{ellipsise});
1554 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1555 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1556 1626
1557 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1627 new_from_layout CFClient::Texture $self->{layout}
1628 };
1558 1629
1630 unless (exists $self->{ox}) {
1559 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1560 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1561 : ($self->{w} - $tex->{w}) * 0.5); 1633 : ($self->{w} - $tex->{w}) * 0.5);
1562 1634
1563 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1565 : ($self->{h} - $tex->{h}) * 0.5); 1637 : ($self->{h} - $tex->{h}) * 0.5);
1566
1567 $tex
1568 }; 1638 };
1569 1639
1570 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1571 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1572 1642
… …
1610 1680
1611 delete $self->{cur_h}; 1681 delete $self->{cur_h};
1612 1682
1613 return if $self->{text} eq $text; 1683 return if $self->{text} eq $text;
1614 1684
1615 delete $self->{texture};
1616
1617 $self->{last_activity} = $::NOW; 1685 $self->{last_activity} = $::NOW;
1618 $self->{text} = $text; 1686 $self->{text} = $text;
1619 1687
1620 $text =~ s/./*/g if $self->{hidden}; 1688 $text =~ s/./*/g if $self->{hidden};
1621 $self->{layout}->set_text ("$text "); 1689 $self->{layout}->set_text ("$text ");
1622 1690
1623 $self->_emit (changed => $self->{text}); 1691 $self->_emit (changed => $self->{text});
1692 $self->update;
1624} 1693}
1625 1694
1626sub set_text { 1695sub set_text {
1627 my ($self, $text) = @_; 1696 my ($self, $text) = @_;
1628 1697
1629 $self->{cursor} = length $text; 1698 $self->{cursor} = length $text;
1630 $self->_set_text ($text); 1699 $self->_set_text ($text);
1631 $self->update; 1700
1632 $self->check_size; 1701 $self->realloc;
1633} 1702}
1634 1703
1635sub get_text { 1704sub get_text {
1636 $_[0]{text} 1705 $_[0]{text}
1637} 1706}
… …
1667 $self->{cursor} = length $text; 1736 $self->{cursor} = length $text;
1668 } elsif ($uni == 27) { 1737 } elsif ($uni == 27) {
1669 $self->_emit ('escape'); 1738 $self->_emit ('escape');
1670 } elsif ($uni) { 1739 } elsif ($uni) {
1671 substr $text, $self->{cursor}++, 0, chr $uni; 1740 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else {
1742 return 0;
1672 } 1743 }
1673 1744
1674 $self->_set_text ($text); 1745 $self->_set_text ($text);
1675 $self->update; 1746
1676 $self->check_size; 1747 $self->realloc;
1748
1749 1
1677} 1750}
1678 1751
1679sub focus_in { 1752sub focus_in {
1680 my ($self) = @_; 1753 my ($self) = @_;
1681 1754
… …
1696 utf8::encode $text; 1769 utf8::encode $text;
1697 $self->{cursor} = length substr $text, 0, $idx; 1770 $self->{cursor} = length substr $text, 0, $idx;
1698 1771
1699 $self->_set_text ($self->{text}); 1772 $self->_set_text ($self->{text});
1700 $self->update; 1773 $self->update;
1774
1775 1
1701} 1776}
1702 1777
1703sub mouse_motion { 1778sub mouse_motion {
1704 my ($self, $ev, $x, $y) = @_; 1779 my ($self, $ev, $x, $y) = @_;
1705# 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
1706} 1783}
1707 1784
1708sub _draw { 1785sub _draw {
1709 my ($self) = @_; 1786 my ($self) = @_;
1710 1787
1711 local $self->{fg} = $self->{fg}; 1788 local $self->{fg} = $self->{fg};
1712 1789
1713 if ($FOCUS == $self) { 1790 if ($FOCUS == $self) {
1714 glColor @{$self->{active_bg}}; 1791 glColor_premultiply @{$self->{active_bg}};
1715 $self->{fg} = $self->{active_fg}; 1792 $self->{fg} = $self->{active_fg};
1716 } else { 1793 } else {
1717 glColor @{$self->{bg}}; 1794 glColor_premultiply @{$self->{bg}};
1718 } 1795 }
1719 1796
1720 glEnable GL_BLEND; 1797 glEnable GL_BLEND;
1721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1798 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1722 glBegin GL_QUADS; 1799 glBegin GL_QUADS;
1723 glVertex 0 , 0; 1800 glVertex 0 , 0;
1724 glVertex 0 , $self->{h}; 1801 glVertex 0 , $self->{h};
1725 glVertex $self->{w}, $self->{h}; 1802 glVertex $self->{w}, $self->{h};
1726 glVertex $self->{w}, 0; 1803 glVertex $self->{w}, 0;
… …
1787 } else { 1864 } else {
1788 $self->set_text ($self->{history_saveback}); 1865 $self->set_text ($self->{history_saveback});
1789 } 1866 }
1790 1867
1791 } else { 1868 } else {
1792 $self->SUPER::key_down ($ev); 1869 return $self->SUPER::key_down ($ev)
1870 }
1871
1793 } 1872 1
1794
1795} 1873}
1796 1874
1797############################################################################# 1875#############################################################################
1798 1876
1799package CFClient::UI::Button; 1877package CFClient::UI::Button;
… …
1808 1886
1809sub new { 1887sub new {
1810 my $class = shift; 1888 my $class = shift;
1811 1889
1812 $class->SUPER::new ( 1890 $class->SUPER::new (
1813 padding => 4, 1891 padding_x => 4,
1892 padding_y => 4,
1814 fg => [1, 1, 1], 1893 fg => [1, 1, 1],
1815 active_fg => [0, 0, 1], 1894 active_fg => [0, 0, 1],
1816 can_hover => 1, 1895 can_hover => 1,
1817 align => 0, 1896 align => 0,
1818 valign => 0, 1897 valign => 0,
… …
1827 my ($self, $ev, $x, $y) = @_; 1906 my ($self, $ev, $x, $y) = @_;
1828 1907
1829 $self->emit ("activate") 1908 $self->emit ("activate")
1830 if $x >= 0 && $x < $self->{w} 1909 if $x >= 0 && $x < $self->{w}
1831 && $y >= 0 && $y < $self->{h}; 1910 && $y >= 0 && $y < $self->{h};
1911
1912 1
1832} 1913}
1833 1914
1834sub _draw { 1915sub _draw {
1835 my ($self) = @_; 1916 my ($self) = @_;
1836 1917
… …
1865 1946
1866sub new { 1947sub new {
1867 my $class = shift; 1948 my $class = shift;
1868 1949
1869 $class->SUPER::new ( 1950 $class->SUPER::new (
1870 padding => 2, 1951 padding_x => 2,
1952 padding_y => 2,
1871 fg => [1, 1, 1], 1953 fg => [1, 1, 1],
1872 active_fg => [1, 1, 0], 1954 active_fg => [1, 1, 0],
1873 bg => [0, 0, 0, 0.2], 1955 bg => [0, 0, 0, 0.2],
1874 active_bg => [1, 1, 1, 0.5], 1956 active_bg => [1, 1, 1, 0.5],
1875 state => 0, 1957 state => 0,
… …
1879} 1961}
1880 1962
1881sub size_request { 1963sub size_request {
1882 my ($self) = @_; 1964 my ($self) = @_;
1883 1965
1884 ($self->{padding} * 2 + 6) x 2 1966 (6) x 2
1885} 1967}
1886 1968
1887sub button_down { 1969sub button_down {
1888 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1889 1971
1890 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1891 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1892 $self->{state} = !$self->{state}; 1974 $self->{state} = !$self->{state};
1893 $self->_emit (changed => $self->{state}); 1975 $self->_emit (changed => $self->{state});
1976 } else {
1977 return 0
1978 }
1979
1894 } 1980 1
1895} 1981}
1896 1982
1897sub _draw { 1983sub _draw {
1898 my ($self) = @_; 1984 my ($self) = @_;
1899 1985
1900 $self->SUPER::_draw; 1986 $self->SUPER::_draw;
1901 1987
1902 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1988 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1903 1989
1904 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;
1905 1993
1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1994 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1907 1995
1908 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1996 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909 1997
… …
2064 2152
2065 my $h1 = $self->{h} * (1 - $ycut1); 2153 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2154 my $h2 = $self->{h} * (1 - $ycut2);
2067 2155
2068 glEnable GL_BLEND; 2156 glEnable GL_BLEND;
2069 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;
2070 glEnable GL_TEXTURE_2D; 2159 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2161
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2162 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2163 glBegin GL_QUADS;
… …
2174 fg => [1, 1, 1], 2263 fg => [1, 1, 1],
2175 active_fg => [0, 0, 0], 2264 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2], 2265 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5], 2266 active_bg => [1, 1, 1, 0.5],
2178 range => [0, 0, 100, 10, 0], 2267 range => [0, 0, 100, 10, 0],
2179 req_w => $::WIDTH / 80, 2268 min_w => $::WIDTH / 80,
2180 req_h => $::WIDTH / 80, 2269 min_h => $::WIDTH / 80,
2181 vertical => 0, 2270 vertical => 0,
2182 can_hover => 1, 2271 can_hover => 1,
2183 inner_pad => 0.02, 2272 inner_pad => 0.02,
2184 @_ 2273 @_
2185 ); 2274 );
… …
2188 $self->update; 2277 $self->update;
2189 2278
2190 $self 2279 $self
2191} 2280}
2192 2281
2282sub changed { }
2283
2193sub set_range { 2284sub set_range {
2194 my ($self, $range) = @_; 2285 my ($self, $range) = @_;
2195 2286
2196 ($range, $self->{range}) = ($self->{range}, $range); 2287 ($range, $self->{range}) = ($self->{range}, $range);
2197 2288
… …
2223} 2314}
2224 2315
2225sub size_request { 2316sub size_request {
2226 my ($self) = @_; 2317 my ($self) = @_;
2227 2318
2228 my $w = $self->{req_w}; 2319 ($self->{req_w}, $self->{req_h})
2229 my $h = $self->{req_h};
2230
2231 $self->{vertical} ? ($h, $w) : ($w, $h)
2232} 2320}
2233 2321
2234sub button_down { 2322sub button_down {
2235 my ($self, $ev, $x, $y) = @_; 2323 my ($self, $ev, $x, $y) = @_;
2236 2324
2237 $self->SUPER::button_down ($ev, $x, $y); 2325 $self->SUPER::button_down ($ev, $x, $y);
2238 2326
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240 2328
2241 $self->mouse_motion ($ev, $x, $y); 2329 $self->mouse_motion ($ev, $x, $y)
2242} 2330}
2243 2331
2244sub mouse_motion { 2332sub mouse_motion {
2245 my ($self, $ev, $x, $y) = @_; 2333 my ($self, $ev, $x, $y) = @_;
2246 2334
… …
2250 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2338 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251 2339
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2340 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253 2341
2254 $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
2255 } 2347 1
2256} 2348}
2257 2349
2258sub update { 2350sub update {
2259 my ($self) = @_; 2351 my ($self) = @_;
2260 2352
2261 $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}) {
2262 $self->set_value ($self->{range}[0]); 2361 $self->set_value ($self->{range}[0]);
2263 2362
2264 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2363 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100; 2364 my $range = ($hi - $page - $lo) || 1e-100;
2266 2365
… …
2272 $value = ($value - $lo) / $range; 2371 $value = ($value - $lo) / $range;
2273 $value = $value * $self->{scale} + $self->{offset}; 2372 $value = $value * $self->{scale} + $self->{offset};
2274 2373
2275 $self->{knob_x} = $value - $knob_w * 0.5; 2374 $self->{knob_x} = $value - $knob_w * 0.5;
2276 $self->{knob_w} = $knob_w; 2375 $self->{knob_w} = $knob_w;
2277 }); 2376 }
2278
2279 $self->SUPER::update;
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284 2377
2285 $self->SUPER::_draw (); 2378 $self->SUPER::_draw ();
2286 2379
2287 glScale $self->{w}, $self->{h}; 2380 glScale $self->{w}, $self->{h};
2288 2381
… …
2592 state => 0, 2685 state => 0,
2593 on_activate => \&toggle_flopper, 2686 on_activate => \&toggle_flopper,
2594 @_ 2687 @_
2595 ); 2688 );
2596 2689
2597 if ($self->{state}) {
2598 $self->{state} = 0;
2599 $self->toggle_flopper;
2600 }
2601
2602 $self 2690 $self
2603} 2691}
2604 2692
2605sub toggle_flopper { 2693sub toggle_flopper {
2606 my ($self) = @_; 2694 my ($self) = @_;
2607 2695
2608 # TODO: use animation 2696 $self->{other}->toggle_visibility;
2609 if ($self->{state} = !$self->{state}) {
2610 $CFClient::UI::ROOT->add ($self->{other});
2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2612 $self->_emit ("open");
2613 } else {
2614 $CFClient::UI::ROOT->remove ($self->{other});
2615 $self->_emit ("close");
2616 }
2617
2618 $self->_emit (changed => $self->{state});
2619} 2697}
2620 2698
2621############################################################################# 2699#############################################################################
2622 2700
2623package CFClient::UI::Tooltip; 2701package CFClient::UI::Tooltip;
… …
2636} 2714}
2637 2715
2638sub set_tooltip_from { 2716sub set_tooltip_from {
2639 my ($self, $widget) = @_; 2717 my ($self, $widget) = @_;
2640 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
2641 $self->add (new CFClient::UI::Label 2728 $self->add (new CFClient::UI::Label
2642 markup => $widget->{tooltip}, 2729 markup => $tooltip,
2643 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2644 fontsize => 0.8, 2731 fontsize => 0.8,
2645 fg => [0, 0, 0, 1], 2732 fg => [0, 0, 0, 1],
2646 ellipsise => 0, 2733 ellipsise => 0,
2647 font => ($widget->{tooltip_font} || $::FONT_PROP), 2734 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2658 2745
2659sub size_allocate { 2746sub size_allocate {
2660 my ($self, $w, $h) = @_; 2747 my ($self, $w, $h) = @_;
2661 2748
2662 $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 });
2663} 2768}
2664 2769
2665sub _draw { 2770sub _draw {
2666 my ($self) = @_; 2771 my ($self) = @_;
2667 2772
… …
2684 glVertex $w, $h; 2789 glVertex $w, $h;
2685 glVertex $w, 0; 2790 glVertex $w, 0;
2686 glEnd; 2791 glEnd;
2687 2792
2688 glTranslate 2 - 0.375, 2 - 0.375; 2793 glTranslate 2 - 0.375, 2 - 0.375;
2794
2689 $self->SUPER::_draw; 2795 $self->SUPER::_draw;
2690} 2796}
2691 2797
2692############################################################################# 2798#############################################################################
2693 2799
… …
2769 $self->SUPER::DESTROY; 2875 $self->SUPER::DESTROY;
2770} 2876}
2771 2877
2772############################################################################# 2878#############################################################################
2773 2879
2774package CFClient::UI::Inventory; 2880package CFClient::UI::Buttonbar;
2775 2881
2776our @ISA = CFClient::UI::ScrolledWindow::; 2882our @ISA = CFClient::UI::HBox::;
2777 2883
2778sub new { 2884# TODO: should actualyl wrap buttons and other goodies.
2779 my $class = shift;
2780
2781 my $self = $class->SUPER::new (
2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783 @_,
2784 );
2785
2786 $self
2787}
2788
2789sub set_items {
2790 my ($self, $items) = @_;
2791
2792 $self->{scrolled}->clear;
2793 return unless $items;
2794
2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2799
2800 $self->{real_items} = \@items;
2801
2802 my $row = 0;
2803 for my $item (@items) {
2804 CFClient::Item::update_widgets $item;
2805
2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810 $row++;
2811 }
2812}
2813
2814sub size_request {
2815 my ($self) = @_;
2816 ($self->{req_w}, $self->{req_h});
2817}
2818 2885
2819############################################################################# 2886#############################################################################
2820 2887
2821package CFClient::UI::Menu; 2888package CFClient::UI::Menu;
2822 2889
… …
2863 # maybe save $GRAB? must be careful about events... 2930 # maybe save $GRAB? must be careful about events...
2864 $GRAB = $self; 2931 $GRAB = $self;
2865 $self->{button} = $ev->{button}; 2932 $self->{button} = $ev->{button};
2866 2933
2867 $self->show; 2934 $self->show;
2868 $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);
2869} 2936}
2870 2937
2871sub mouse_motion { 2938sub mouse_motion {
2872 my ($self, $ev, $x, $y) = @_; 2939 my ($self, $ev, $x, $y) = @_;
2873 2940
2874 # TODO: should use vbox->find_widget or so 2941 # TODO: should use vbox->find_widget or so
2875 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2876 $self->{hover} = $self->{item}{$HOVER}; 2943 $self->{hover} = $self->{item}{$HOVER};
2944
2945 0
2877} 2946}
2878 2947
2879sub button_up { 2948sub button_up {
2880 my ($self, $ev, $x, $y) = @_; 2949 my ($self, $ev, $x, $y) = @_;
2881 2950
… …
2883 undef $GRAB; 2952 undef $GRAB;
2884 $self->hide; 2953 $self->hide;
2885 2954
2886 $self->_emit ("popdown"); 2955 $self->_emit ("popdown");
2887 $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 );
2888 } 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});
2889} 3070}
2890 3071
2891############################################################################# 3072#############################################################################
2892 3073
2893package CFClient::UI::Statusbox; 3074package CFClient::UI::Statusbox;
… …
2998 $self->SUPER::reconfigure; 3179 $self->SUPER::reconfigure;
2999} 3180}
3000 3181
3001############################################################################# 3182#############################################################################
3002 3183
3003package CFClient::UI::Root; 3184package CFClient::UI::Inventory;
3004 3185
3005our @ISA = CFClient::UI::Container::; 3186our @ISA = CFClient::UI::ScrolledWindow::;
3006
3007use CFClient::OpenGL;
3008 3187
3009sub new { 3188sub new {
3010 my $class = shift; 3189 my $class = shift;
3011 3190
3012 $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 (
3013 visible => 1, 3489 visible => 1,
3014 @_, 3490 @_,
3015 ) 3491 );
3016}
3017 3492
3018sub configure { 3493 Scalar::Util::weaken ($self->{root} = $self);
3019 my ($self, $x, $y, $w, $h) = @_;
3020 3494
3021 $self->{w} = $w; 3495 $self
3022 $self->{h} = $h;
3023}
3024
3025sub check_size {
3026 my ($self) = @_;
3027
3028 $self->size_allocate ($self->{w}, $self->{h})
3029 if $self->{w};
3030} 3496}
3031 3497
3032sub size_request { 3498sub size_request {
3033 my ($self) = @_; 3499 my ($self) = @_;
3034 3500
3035 ($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
3036} 3516}
3037 3517
3038sub size_allocate { 3518sub size_allocate {
3039 my ($self, $w, $h) = @_; 3519 my ($self, $w, $h) = @_;
3040 3520
3041 for my $child ($self->children) { 3521 for my $child ($self->children) {
3042 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)};
3043 3523
3044 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3524 $X = $child->{force_x} if exists $child->{force_x};
3045 if exists $child->{req_x}; 3525 $Y = $child->{force_y} if exists $child->{force_y};
3046 3526
3047 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3527 $X = _to_pixel $X, $W, $self->{w};
3048 if exists $child->{req_y}; 3528 $Y = _to_pixel $Y, $H, $self->{h};
3049
3050 $X = $self->{user_x} if exists $self->{user_x};
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052
3053 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3054 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3055 3529
3056 $child->configure ($X, $Y, $W, $H); 3530 $child->configure ($X, $Y, $W, $H);
3057 } 3531 }
3058} 3532}
3059 3533
… …
3070} 3544}
3071 3545
3072sub update { 3546sub update {
3073 my ($self) = @_; 3547 my ($self) = @_;
3074 3548
3075 $self->check_size;
3076 $::WANT_REFRESH++; 3549 $::WANT_REFRESH++;
3077} 3550}
3078 3551
3079sub add { 3552sub add {
3080 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
3081 3554
3082 for (my @widgets = @children; my $w = pop @widgets; ) {
3083 push @widgets, $w->children;
3084 $w->{root} = $self;
3085 $w->{visible} = $self->{visible} + 1;
3086 }
3087
3088 for my $child (@children) {
3089 $child->{is_toplevel} = 1; 3555 $_->{is_toplevel} = 1
3090 3556 for @children;
3091 # integerise window positions
3092 $child->{x} = int $child->{x};
3093 $child->{y} = int $child->{y};
3094 }
3095 3557
3096 $self->SUPER::add (@children); 3558 $self->SUPER::add (@children);
3097} 3559}
3098 3560
3099sub remove { 3561sub remove {
3100 my ($self, @children) = @_; 3562 my ($self, @children) = @_;
3101 3563
3102 $self->SUPER::remove (@children); 3564 $self->SUPER::remove (@children);
3565
3566 delete $self->{is_toplevel}
3567 for @children;
3103 3568
3104 while (@children) { 3569 while (@children) {
3105 my $w = pop @children; 3570 my $w = pop @children;
3106 push @children, $w->children; 3571 push @children, $w->children;
3107 $w->set_invisible; 3572 $w->set_invisible;
… …
3126 while ($self->{refresh_hook}) { 3591 while ($self->{refresh_hook}) {
3127 $_->() 3592 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3593 for values %{delete $self->{refresh_hook}};
3129 } 3594 }
3130 3595
3131 if ($self->{check_size}) { 3596 if ($self->{realloc}) {
3597 my %queue;
3132 my @queue; 3598 my @queue;
3599 my $widget;
3133 3600
3134 for (;;) { 3601 outer:
3135 if ($self->{check_size}) { 3602 while () {
3136 #TODO use array-of-depth approach 3603 if (my $realloc = delete $self->{realloc}) {
3604 for $widget (values %$realloc) {
3605 $widget->{visible} or next; # do not resize invisible widgets
3137 3606
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3607 $queue{$widget+0}++ and next; # duplicates are common
3139 @queue, values %{delete $self->{check_size}}; 3608
3609 push @{ $queue[$widget->{visible}] }, $widget;
3610 }
3140 } 3611 }
3141 3612
3613 while () {
3614 @queue or last outer;
3615
3142 my $widget = pop @queue || last; 3616 $widget = pop @{ $queue[-1] || [] }
3143 3617 and last;
3144 defined $widget->{visible} or last; # do not resize invisible widgets
3145
3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3147 ? @$widget{qw(user_w user_h)}
3148 : $widget->size_request;
3149
3150 if (delete $widget->{force_alloc}
3151 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3152 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3153 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}) {
3154 $widget->{req_w} = $w; 3634 $widget->{req_w} = $w;
3155 $widget->{req_h} = $h; 3635 $widget->{req_h} = $h;
3156 3636
3157 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3637 $self->{size_alloc}{$widget+0} = $widget;
3158 3638
3159 $widget->{parent}->check_size
3160 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 }
3161 } 3646 }
3647
3648 delete $self->{realloc}{$widget+0};
3162 } 3649 }
3163 } 3650 }
3164 3651
3165 while ($self->{size_alloc}) { 3652 while (my $size_alloc = delete $self->{size_alloc}) {
3166 for (values %{delete $self->{size_alloc}}) { 3653 my @queue = sort { $b->{visible} <=> $a->{visible} }
3167 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)};
3168 3660
3169 $w = 0 if $w < 0; 3661 $w = 0 if $w < 0;
3170 $h = 0 if $h < 0; 3662 $h = 0 if $h < 0;
3171 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
3172 $widget->{w} = $w; 3671 $widget->{w} = $w;
3173 $widget->{h} = $h; 3672 $widget->{h} = $h;
3673
3174 $widget->emit (size_allocate => $w, $h); 3674 $widget->emit (size_allocate => $w, $h);
3675 }
3175 } 3676 }
3176 } 3677 }
3177 3678
3178 while ($self->{post_alloc_hook}) { 3679 while ($self->{post_alloc_hook}) {
3179 $_->() 3680 $_->()
3180 for values %{delete $self->{post_alloc_hook}}; 3681 for values %{delete $self->{post_alloc_hook}};
3181 } 3682 }
3683
3182 3684
3183 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3685 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3184 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3686 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3185 glClear GL_COLOR_BUFFER_BIT; 3687 glClear GL_COLOR_BUFFER_BIT;
3186 3688
… …
3188 glLoadIdentity; 3690 glLoadIdentity;
3189 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3190 glMatrixMode GL_MODELVIEW; 3692 glMatrixMode GL_MODELVIEW;
3191 glLoadIdentity; 3693 glLoadIdentity;
3192 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
3193 $self->_draw; 3702 $self->_draw;
3194} 3703}
3195 3704
3196############################################################################# 3705#############################################################################
3197 3706

Diff Legend

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