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.279 by root, Mon Jun 5 00:17:47 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;
791 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
792 861
793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
794 863
795 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
796} 865}
… …
812} 881}
813 882
814sub size_request { 883sub size_request {
815 my ($self) = @_; 884 my ($self) = @_;
816 885
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818 887
819 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y};
890
891 ($w, $h)
820} 892}
821 893
822sub size_allocate { 894sub size_allocate {
823 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
824 896
897 my $child = $self->child;
898
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827 901
828 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
829 $self->update; 903 $self->update;
830} 904}
831 905
… …
867} 941}
868 942
869sub _render { 943sub _render {
870 my ($self) = @_; 944 my ($self) = @_;
871 945
946 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
947 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
948
872 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873 950
874 $self->SUPER::_render; 951 $self->SUPER::_render;
875} 952}
876 953
… …
879package CFClient::UI::ScrolledWindow; 956package CFClient::UI::ScrolledWindow;
880 957
881our @ISA = CFClient::UI::HBox::; 958our @ISA = CFClient::UI::HBox::;
882 959
883sub new { 960sub new {
884 my $class = shift; 961 my ($class, %arg) = @_;
962
963 my $child = delete $arg{child};
885 964
886 my $self; 965 my $self;
887 966
888 my $slider = new CFClient::UI::Slider 967 my $slider = new CFClient::UI::Slider
889 vertical => 1, 968 vertical => 1,
890 range => [0, 0, 1, 0.01], # HACK fix 969 range => [0, 0, 1, 0.01], # HACK fix
891 connect_changed => sub { 970 on_changed => sub {
892 $self->{vp}->set_offset (0, $_[1]); 971 $self->{vp}->set_offset (0, $_[1]);
893 }, 972 },
894 ; 973 ;
895 974
896 $self = $class->SUPER::new ( 975 $self = $class->SUPER::new (
897 vp => (new CFClient::UI::ViewPort expand => 1), 976 vp => (new CFClient::UI::ViewPort expand => 1),
898 slider => $slider, 977 slider => $slider,
899 @_, 978 %arg,
900 ); 979 );
901 980
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider}); 981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
905 983
906 $self 984 $self
985}
986
987sub add {
988 my ($self, $widget) = @_;
989
990 $self->{vp}->add ($self->{child} = $widget);
907} 991}
908 992
909sub update { 993sub update {
910 my ($self) = @_; 994 my ($self) = @_;
911 995
… …
950 1034
951 if ($self->{bg}) { 1035 if ($self->{bg}) {
952 my ($w, $h) = @$self{qw(w h)}; 1036 my ($w, $h) = @$self{qw(w h)};
953 1037
954 glEnable GL_BLEND; 1038 glEnable GL_BLEND;
955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
956 glColor @{ $self->{bg} }; 1040 glColor_premultiply @{ $self->{bg} };
957 1041
958 glBegin GL_QUADS; 1042 glBegin GL_QUADS;
959 glVertex 0 , 0; 1043 glVertex 0 , 0;
960 glVertex 0 , $h; 1044 glVertex 0 , $h;
961 glVertex $w, $h; 1045 glVertex $w, $h;
… …
974 1058
975our @ISA = CFClient::UI::Bin::; 1059our @ISA = CFClient::UI::Bin::;
976 1060
977use CFClient::OpenGL; 1061use CFClient::OpenGL;
978 1062
979my @tex = 1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1068 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); 1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982 1070
983sub new { 1071sub new {
984 my $class = shift; 1072 my ($class, %arg) = @_;
985 1073
986 # TODO: user_x, user_y, overwrite moveto? 1074 my $title = delete $arg{title};
987 1075
988 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1079 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1080 can_events => 1,
994 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
995 ); 1084 );
996 1085
997 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
998 align => 0, 1087 align => 0,
999 valign => 1, 1088 valign => 1,
1000 text => $self->{title}, 1089 text => $title,
1001 fontsize => $self->{border}; 1090 fontsize => $self->{border}
1091 if defined $title;
1002 1092
1003 $self 1093 $self
1094}
1095
1096sub add {
1097 my ($self, @widgets) = @_;
1098
1099 $self->SUPER::add (@widgets);
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1004} 1101}
1005 1102
1006sub border { 1103sub border {
1007 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
1008} 1105}
1009 1106
1010sub size_request { 1107sub size_request {
1011 my ($self) = @_; 1108 my ($self) = @_;
1109
1110 $self->{title}->size_request
1111 if $self->{title};
1012 1112
1013 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
1014 1114
1015 ( 1115 (
1016 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
1019} 1119}
1020 1120
1021sub size_allocate { 1121sub size_allocate {
1022 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
1023 1123
1124 if ($self->{title}) {
1125 $self->{title}{w} = $w;
1126 $self->{title}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h);
1128 }
1129
1130 my $border = $self->border;
1131
1024 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
1026 1134
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); 1135 $self->child->configure ($border, $border, $w, $h);
1031} 1136}
1032 1137
1033sub button_down { 1138sub button_down {
1034 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
1035 1140
… …
1051 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
1052 1157
1053 my $dx = $ev->{x} - $ox; 1158 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1159 my $dy = $ev->{y} - $oy;
1055 1160
1056 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1057 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1163
1058 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1059 $self->check_size; 1165 $self->realloc;
1060 }; 1166 };
1061 1167
1062 } elsif ($lr ^ $td) { 1168 } elsif ($lr ^ $td) {
1063 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1064 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1066 $self->{motion} = sub { 1172 $self->{motion} = sub {
1067 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
1068 1174
1069 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
1070 1176
1071 $self->move ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1072 $self->update; 1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1073 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
1074 } 1185 1
1075} 1186}
1076 1187
1077sub button_up { 1188sub button_up {
1078 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
1079 1190
1080 delete $self->{motion}; 1191 !!delete $self->{motion}
1081} 1192}
1082 1193
1083sub mouse_motion { 1194sub mouse_motion {
1084 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
1085 1196
1086 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
1087} 1200}
1088 1201
1089sub _draw { 1202sub _draw {
1090 my ($self) = @_; 1203 my ($self) = @_;
1091 1204
1205 my $child = $self->{children}[0];
1206
1092 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
1093 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
1094 1209
1095 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
1096 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1097 1212
1098 my $border = $self->border; 1213 my $border = $self->border;
1099 1214
1100 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
1101 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1102 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1103 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1104 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1105 1220
1106 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1107 my $bg = $tex[0]; 1222 glColor @{ $self->{bg} };
1108 1223
1109 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
1225 # solve this better(?)
1110 my $rep_x = $cw / $bg->{w}; 1226 $bg->{s} = $cw / $bg->{w};
1111 my $rep_y = $ch / $bg->{h}; 1227 $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); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1119 } 1229 }
1120 1230
1121 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
1122 1232
1123 $self->{title}->draw if $self->{title};
1124
1125 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
1126} 1239}
1127 1240
1128############################################################################# 1241#############################################################################
1129 1242
1130package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
1152 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
1153 1266
1154 $child->set_parent ($self); 1267 $child->set_parent ($self);
1155 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
1156 1269
1157 $self->check_size (1); 1270 $self->realloc;
1158} 1271}
1159 1272
1160# TODO: move to container class maybe? send children a signal on removal? 1273# TODO: move to container class maybe? send children a signal on removal?
1161sub clear { 1274sub clear {
1162 my ($self) = @_; 1275 my ($self) = @_;
… …
1167 for (@children) { 1280 for (@children) {
1168 delete $_->{parent}; 1281 delete $_->{parent};
1169 $_->hide; 1282 $_->hide;
1170 } 1283 }
1171 1284
1172 $self->check_size (1); 1285 $self->realloc;
1173 $self->update;
1174} 1286}
1175 1287
1176sub get_wh { 1288sub get_wh {
1177 my ($self) = @_; 1289 my ($self) = @_;
1178 1290
… …
1274 } 1386 }
1275} 1387}
1276 1388
1277############################################################################# 1389#############################################################################
1278 1390
1279package CFClient::UI::HBox; 1391package CFClient::UI::Box;
1280
1281# TODO: wrap into common Box base class
1282 1392
1283our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
1284 1394
1285sub size_request { 1395sub size_request {
1286 my ($self) = @_; 1396 my ($self) = @_;
1287 1397
1288 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
1289 1399 ? (
1290 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1291 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1292 (List::Util::max map $_->[1], @alloc), 1402 )
1293 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
1294} 1407}
1295 1408
1296sub size_allocate { 1409sub size_allocate {
1297 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
1298 1411
1299 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
1300
1301 my $children = $self->{children}; 1413 my $children = $self->{children};
1302 1414
1303 my @h = map $_->{req_w}, @$children; 1415 my @req;
1304 1416
1305 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
1306 1418 @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 { 1419 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1421 my $req = List::Util::sum @req;
1422
1423 if ($req > $space) {
1424 # ah well, not enough space
1425 $_ *= $space / $req for @req;
1426 } else {
1311 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1312 $exp ||= 1;
1313 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
1314 for (0 .. $#$children) { 1432 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 } 1433 }
1321 } 1434 }
1322 1435
1323 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
1324 1437
1325 my $y = 0; 1438 my $pos = 0;
1326 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_]; 1440 my $alloc = $req[$_];
1329 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1330 1442
1331 $y += $h; 1443 $pos += $alloc;
1332 } 1444 }
1333 1445
1334 1 1446 1
1335} 1447}
1336 1448
1337############################################################################# 1449#############################################################################
1338 1450
1451package CFClient::UI::HBox;
1452
1453our @ISA = CFClient::UI::Box::;
1454
1455sub new {
1456 my $class = shift;
1457
1458 $class->SUPER::new (
1459 vertical => 0,
1460 @_,
1461 )
1462}
1463
1464#############################################################################
1465
1339package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
1340 1467
1341# TODO: wrap into common Box base class
1342
1343our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
1344 1469
1345sub size_request { 1470sub new {
1346 my ($self) = @_; 1471 my $class = shift;
1347 1472
1348 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
1349 1474 vertical => 1,
1350 ( 1475 @_,
1351 (List::Util::max map $_->[0], @alloc),
1352 (List::Util::sum map $_->[1], @alloc),
1353 ) 1476 )
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} 1477}
1394 1478
1395############################################################################# 1479#############################################################################
1396 1480
1397package CFClient::UI::Label; 1481package CFClient::UI::Label;
… …
1414 ellipsise => 3, # end 1498 ellipsise => 3, # end
1415 layout => (new CFClient::Layout), 1499 layout => (new CFClient::Layout),
1416 fontsize => 1, 1500 fontsize => 1,
1417 align => -1, 1501 align => -1,
1418 valign => -1, 1502 valign => -1,
1419 padding => 2, 1503 padding_x => 2,
1504 padding_y => 2,
1420 can_events => 0, 1505 can_events => 0,
1421 %arg 1506 %arg
1422 ); 1507 );
1423 1508
1424 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
… …
1460 $self->{text} = "T$text"; 1545 $self->{text} = "T$text";
1461 1546
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1464 1549
1550 $self->realloc;
1465 $self->update; 1551 $self->update;
1466 $self->check_size;
1467} 1552}
1468 1553
1469sub set_markup { 1554sub set_markup {
1470 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1471 1556
… …
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1560 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1561
1477 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1479 1564
1565 $self->realloc;
1480 $self->update; 1566 $self->update;
1481 $self->check_size;
1482} 1567}
1483 1568
1484sub size_request { 1569sub size_request {
1485 my ($self) = @_; 1570 my ($self) = @_;
1486 1571
… …
1500 1585
1501 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1502 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1503 } 1588 }
1504 1589
1505 ( 1590 ($w, $h)
1506 $w + $self->{padding} * 2,
1507 $h + $self->{padding} * 2,
1508 )
1509} 1591}
1510 1592
1511sub size_allocate { 1593sub size_allocate {
1512 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1513 1595
1596 delete $self->{ox};
1597
1514 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515} 1600}
1516 1601
1517sub set_fontsize { 1602sub set_fontsize {
1518 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1519 1604
1520 $self->{fontsize} = $fontsize; 1605 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1606 delete $self->{texture};
1522 1607
1523 $self->update; 1608 $self->realloc;
1524 $self->check_size;
1525} 1609}
1526 1610
1527sub _draw { 1611sub _draw {
1528 my ($self) = @_; 1612 my ($self) = @_;
1529 1613
… …
1535 $self->{layout}->set_width ($self->{w}); 1619 $self->{layout}->set_width ($self->{w});
1536 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1620 $self->{layout}->set_ellipsise ($self->{ellipsise});
1537 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539 1623
1540 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1624 new_from_layout CFClient::Texture $self->{layout}
1625 };
1541 1626
1627 unless (exists $self->{ox}) {
1542 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544 : ($self->{w} - $tex->{w}) * 0.5); 1630 : ($self->{w} - $tex->{w}) * 0.5);
1545 1631
1546 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548 : ($self->{h} - $tex->{h}) * 0.5); 1634 : ($self->{h} - $tex->{h}) * 0.5);
1549
1550 $tex
1551 }; 1635 };
1552 1636
1553 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1555 1639
1640 glColor_premultiply @{$self->{fg}}
1556 if ($tex->{format} == GL_ALPHA) { 1641 if $tex->{format} == GL_ALPHA;
1557 glColor @{$self->{fg}}; 1642
1558 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1559 } else {
1560 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1561 }
1562 1644
1563 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1564} 1646}
1565 1647
1566############################################################################# 1648#############################################################################
… …
1593 1675
1594 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1595 1677
1596 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1597 1679
1598 delete $self->{texture};
1599
1600 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1601 $self->{text} = $text; 1681 $self->{text} = $text;
1602 1682
1603 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1604 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1605 1685
1606 $self->_emit (changed => $self->{text}); 1686 $self->_emit (changed => $self->{text});
1687 $self->update;
1607} 1688}
1608 1689
1609sub set_text { 1690sub set_text {
1610 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1611 1692
1612 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1694 $self->_set_text ($text);
1614 $self->update; 1695
1615 $self->check_size; 1696 $self->realloc;
1616} 1697}
1617 1698
1618sub get_text { 1699sub get_text {
1619 $_[0]{text} 1700 $_[0]{text}
1620} 1701}
… …
1650 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1651 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1652 $self->_emit ('escape'); 1733 $self->_emit ('escape');
1653 } elsif ($uni) { 1734 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1655 } 1738 }
1656 1739
1657 $self->_set_text ($text); 1740 $self->_set_text ($text);
1658 $self->update; 1741
1659 $self->check_size; 1742 $self->realloc;
1743
1744 1
1660} 1745}
1661 1746
1662sub focus_in { 1747sub focus_in {
1663 my ($self) = @_; 1748 my ($self) = @_;
1664 1749
… …
1679 utf8::encode $text; 1764 utf8::encode $text;
1680 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1681 1766
1682 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1683 $self->update; 1768 $self->update;
1769
1770 1
1684} 1771}
1685 1772
1686sub mouse_motion { 1773sub mouse_motion {
1687 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1688# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1689} 1778}
1690 1779
1691sub _draw { 1780sub _draw {
1692 my ($self) = @_; 1781 my ($self) = @_;
1693 1782
1694 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1695 1784
1696 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1697 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1698 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1699 } else { 1788 } else {
1700 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1701 } 1790 }
1702 1791
1703 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1704 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1705 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1706 glVertex 0 , 0; 1795 glVertex 0 , 0;
1707 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1708 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1709 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
… …
1770 } else { 1859 } else {
1771 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1772 } 1861 }
1773 1862
1774 } else { 1863 } else {
1775 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1776 } 1867 1
1777
1778} 1868}
1779 1869
1780############################################################################# 1870#############################################################################
1781 1871
1782package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1791 1881
1792sub new { 1882sub new {
1793 my $class = shift; 1883 my $class = shift;
1794 1884
1795 $class->SUPER::new ( 1885 $class->SUPER::new (
1796 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1797 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1798 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1799 can_hover => 1, 1890 can_hover => 1,
1800 align => 0, 1891 align => 0,
1801 valign => 0, 1892 valign => 0,
… …
1810 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1811 1902
1812 $self->emit ("activate") 1903 $self->emit ("activate")
1813 if $x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1814 && $y >= 0 && $y < $self->{h}; 1905 && $y >= 0 && $y < $self->{h};
1906
1907 1
1815} 1908}
1816 1909
1817sub _draw { 1910sub _draw {
1818 my ($self) = @_; 1911 my ($self) = @_;
1819 1912
1820 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1821
1822 if ($GRAB == $self) {
1823 $self->{fg} = $self->{active_fg};
1824 }
1825 1914
1826 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1827 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1828 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1829 1918
… …
1848 1937
1849sub new { 1938sub new {
1850 my $class = shift; 1939 my $class = shift;
1851 1940
1852 $class->SUPER::new ( 1941 $class->SUPER::new (
1853 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1854 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1855 active_fg => [1, 1, 0], 1945 active_fg => [1, 1, 0],
1856 bg => [0, 0, 0, 0.2], 1946 bg => [0, 0, 0, 0.2],
1857 active_bg => [1, 1, 1, 0.5], 1947 active_bg => [1, 1, 1, 0.5],
1858 state => 0, 1948 state => 0,
… …
1862} 1952}
1863 1953
1864sub size_request { 1954sub size_request {
1865 my ($self) = @_; 1955 my ($self) = @_;
1866 1956
1867 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1868} 1958}
1869 1959
1870sub button_down { 1960sub button_down {
1871 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1872 1962
1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1876 $self->_emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1877 } 1971 1
1878} 1972}
1879 1973
1880sub _draw { 1974sub _draw {
1881 my ($self) = @_; 1975 my ($self) = @_;
1882 1976
1883 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1884 1978
1885 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886 1980
1887 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1981 my ($w, $h) = @$self{qw(w h)};
1982
1983 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888 1984
1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890 1986
1891 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892 1988
… …
2047 2143
2048 my $h1 = $self->{h} * (1 - $ycut1); 2144 my $h1 = $self->{h} * (1 - $ycut1);
2049 my $h2 = $self->{h} * (1 - $ycut2); 2145 my $h2 = $self->{h} * (1 - $ycut2);
2050 2146
2051 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
2052 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2053 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 2152
2056 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
2057 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
… …
2157 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
2158 active_fg => [0, 0, 0], 2255 active_fg => [0, 0, 0],
2159 bg => [0, 0, 0, 0.2], 2256 bg => [0, 0, 0, 0.2],
2160 active_bg => [1, 1, 1, 0.5], 2257 active_bg => [1, 1, 1, 0.5],
2161 range => [0, 0, 100, 10, 0], 2258 range => [0, 0, 100, 10, 0],
2162 req_w => $::WIDTH / 80, 2259 min_w => $::WIDTH / 80,
2163 req_h => $::WIDTH / 80, 2260 min_h => $::WIDTH / 80,
2164 vertical => 0, 2261 vertical => 0,
2165 can_hover => 1, 2262 can_hover => 1,
2166 inner_pad => 0.02, 2263 inner_pad => 0.02,
2167 @_ 2264 @_
2168 ); 2265 );
… …
2171 $self->update; 2268 $self->update;
2172 2269
2173 $self 2270 $self
2174} 2271}
2175 2272
2273sub changed { }
2274
2176sub set_range { 2275sub set_range {
2177 my ($self, $range) = @_; 2276 my ($self, $range) = @_;
2178 2277
2179 ($range, $self->{range}) = ($self->{range}, $range); 2278 ($range, $self->{range}) = ($self->{range}, $range);
2180 2279
… …
2206} 2305}
2207 2306
2208sub size_request { 2307sub size_request {
2209 my ($self) = @_; 2308 my ($self) = @_;
2210 2309
2211 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
2212 my $h = $self->{req_h};
2213
2214 $self->{vertical} ? ($h, $w) : ($w, $h)
2215} 2311}
2216 2312
2217sub button_down { 2313sub button_down {
2218 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
2219 2315
2220 $self->SUPER::button_down ($ev, $x, $y); 2316 $self->SUPER::button_down ($ev, $x, $y);
2221 2317
2222 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223 2319
2224 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
2225} 2321}
2226 2322
2227sub mouse_motion { 2323sub mouse_motion {
2228 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
2229 2325
… …
2233 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2329 my (undef, $lo, $hi, $page) = @{$self->{range}};
2234 2330
2235 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2331 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236 2332
2237 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2333 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2334 } else {
2335 return 0;
2336 }
2337
2238 } 2338 1
2239} 2339}
2240 2340
2241sub update { 2341sub update {
2242 my ($self) = @_; 2342 my ($self) = @_;
2243 2343
2244 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2344 delete $self->{knob_w};
2345 $self->SUPER::update;
2346}
2347
2348sub _draw {
2349 my ($self) = @_;
2350
2351 unless ($self->{knob_w}) {
2245 $self->set_value ($self->{range}[0]); 2352 $self->set_value ($self->{range}[0]);
2246 2353
2247 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100; 2355 my $range = ($hi - $page - $lo) || 1e-100;
2249 2356
… …
2255 $value = ($value - $lo) / $range; 2362 $value = ($value - $lo) / $range;
2256 $value = $value * $self->{scale} + $self->{offset}; 2363 $value = $value * $self->{scale} + $self->{offset};
2257 2364
2258 $self->{knob_x} = $value - $knob_w * 0.5; 2365 $self->{knob_x} = $value - $knob_w * 0.5;
2259 $self->{knob_w} = $knob_w; 2366 $self->{knob_w} = $knob_w;
2260 }); 2367 }
2261
2262 $self->SUPER::update;
2263}
2264
2265sub _draw {
2266 my ($self) = @_;
2267 2368
2268 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
2269 2370
2270 glScale $self->{w}, $self->{h}; 2371 glScale $self->{w}, $self->{h};
2271 2372
… …
2465 2566
2466 delete $self->{texture}; 2567 delete $self->{texture};
2467 } 2568 }
2468 2569
2469 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2470 glClearColor 0.5, 0.5, 0.5, 0; 2571 glClearColor 0, 0, 0, 0;
2471 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
2472 2573
2473 my $top = int $self->{children}[1]{range}[0]; 2574 my $top = int $self->{children}[1]{range}[0];
2474 2575
2475 my $y0 = $top; 2576 my $y0 = $top;
… …
2510sub _draw { 2611sub _draw {
2511 my ($self) = @_; 2612 my ($self) = @_;
2512 2613
2513 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2515 glColor 1, 1, 1, 1; 2616 glColor 0, 0, 0, 1;
2516 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2517 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
2518 2619
2519 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2520 2621
2521} 2622}
… …
2570 2671
2571sub new { 2672sub new {
2572 my $class = shift; 2673 my $class = shift;
2573 2674
2574 my $self = $class->SUPER::new ( 2675 my $self = $class->SUPER::new (
2575 state => 0, 2676 state => 0,
2576 connect_activate => \&toggle_flopper, 2677 on_activate => \&toggle_flopper,
2577 @_ 2678 @_
2578 ); 2679 );
2579 2680
2580 if ($self->{state}) {
2581 $self->{state} = 0;
2582 $self->toggle_flopper;
2583 }
2584
2585 $self 2681 $self
2586} 2682}
2587 2683
2588sub toggle_flopper { 2684sub toggle_flopper {
2589 my ($self) = @_; 2685 my ($self) = @_;
2590 2686
2591 # TODO: use animation 2687 $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} 2688}
2603 2689
2604############################################################################# 2690#############################################################################
2605 2691
2606package CFClient::UI::Tooltip; 2692package CFClient::UI::Tooltip;
… …
2619} 2705}
2620 2706
2621sub set_tooltip_from { 2707sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2708 my ($self, $widget) = @_;
2623 2709
2710 my $tooltip = $widget->{tooltip};
2711
2712 if ($ENV{CFPLUS_DEBUG} & 2) {
2713 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}";
2717 }
2718
2624 $self->add (new CFClient::UI::Label 2719 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2720 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2722 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2723 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2724 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2725 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2641 2736
2642sub size_allocate { 2737sub size_allocate {
2643 my ($self, $w, $h) = @_; 2738 my ($self, $w, $h) = @_;
2644 2739
2645 $self->SUPER::size_allocate ($w - 4, $h - 4); 2740 $self->SUPER::size_allocate ($w - 4, $h - 4);
2741}
2742
2743sub visibility_change {
2744 my ($self, $visible) = @_;
2745
2746 return unless $visible;
2747
2748 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner}
2750 or return;
2751
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH;
2756
2757 $self->move_abs ($x, $y);
2758 });
2646} 2759}
2647 2760
2648sub _draw { 2761sub _draw {
2649 my ($self) = @_; 2762 my ($self) = @_;
2650 2763
… …
2667 glVertex $w, $h; 2780 glVertex $w, $h;
2668 glVertex $w, 0; 2781 glVertex $w, 0;
2669 glEnd; 2782 glEnd;
2670 2783
2671 glTranslate 2 - 0.375, 2 - 0.375; 2784 glTranslate 2 - 0.375, 2 - 0.375;
2785
2672 $self->SUPER::_draw; 2786 $self->SUPER::_draw;
2673} 2787}
2674 2788
2675############################################################################# 2789#############################################################################
2676 2790
… …
2735 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2736 2850
2737 if ($tex) { 2851 if ($tex) {
2738 glEnable GL_TEXTURE_2D; 2852 glEnable GL_TEXTURE_2D;
2739 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2740 glColor 1, 1, 1, 1; 2854 glColor 0, 0, 0, 1;
2741 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2742 glDisable GL_TEXTURE_2D; 2856 glDisable GL_TEXTURE_2D;
2743 } 2857 }
2744} 2858}
2745 2859
… …
2752 $self->SUPER::DESTROY; 2866 $self->SUPER::DESTROY;
2753} 2867}
2754 2868
2755############################################################################# 2869#############################################################################
2756 2870
2757package CFClient::UI::Inventory; 2871package CFClient::UI::Buttonbar;
2758 2872
2759our @ISA = CFClient::UI::ScrolledWindow::; 2873our @ISA = CFClient::UI::HBox::;
2760 2874
2761sub new { 2875# 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 2876
2802############################################################################# 2877#############################################################################
2803 2878
2804package CFClient::UI::Menu; 2879package CFClient::UI::Menu;
2805 2880
… …
2846 # maybe save $GRAB? must be careful about events... 2921 # maybe save $GRAB? must be careful about events...
2847 $GRAB = $self; 2922 $GRAB = $self;
2848 $self->{button} = $ev->{button}; 2923 $self->{button} = $ev->{button};
2849 2924
2850 $self->show; 2925 $self->show;
2851 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2852} 2927}
2853 2928
2854sub mouse_motion { 2929sub mouse_motion {
2855 my ($self, $ev, $x, $y) = @_; 2930 my ($self, $ev, $x, $y) = @_;
2856 2931
2857 # TODO: should use vbox->find_widget or so 2932 # TODO: should use vbox->find_widget or so
2858 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2859 $self->{hover} = $self->{item}{$HOVER}; 2934 $self->{hover} = $self->{item}{$HOVER};
2935
2936 0
2860} 2937}
2861 2938
2862sub button_up { 2939sub button_up {
2863 my ($self, $ev, $x, $y) = @_; 2940 my ($self, $ev, $x, $y) = @_;
2864 2941
… …
2866 undef $GRAB; 2943 undef $GRAB;
2867 $self->hide; 2944 $self->hide;
2868 2945
2869 $self->_emit ("popdown"); 2946 $self->_emit ("popdown");
2870 $self->{hover}[1]->() if $self->{hover}; 2947 $self->{hover}[1]->() if $self->{hover};
2948 } else {
2949 return 0
2950 }
2951
2952 1
2953}
2954
2955#############################################################################
2956
2957package CFClient::UI::Multiplexer;
2958
2959our @ISA = CFClient::UI::Container::;
2960
2961sub new {
2962 my $class = shift;
2963
2964 my $self = $class->SUPER::new (
2965 @_,
2966 );
2967
2968 $self->{current} = $self->{children}[0]
2969 if @{ $self->{children} };
2970
2971 $self
2972}
2973
2974sub add {
2975 my ($self, @widgets) = @_;
2976
2977 $self->SUPER::add (@widgets);
2978
2979 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} };
2981}
2982
2983sub set_current_page {
2984 my ($self, $page_or_widget) = @_;
2985
2986 my $widget = ref $page_or_widget
2987 ? $page_or_widget
2988 : $self->{children}[$page_or_widget];
2989
2990 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992
2993 $self->_emit (page_changed => $self->{current});
2994
2995 $self->realloc;
2996}
2997
2998sub visible_children {
2999 $_[0]{current}
3000}
3001
3002sub size_request {
3003 my ($self) = @_;
3004
3005 $self->{current}->size_request
3006}
3007
3008sub size_allocate {
3009 my ($self, $w, $h) = @_;
3010
3011 $self->{current}->configure (0, 0, $w, $h);
3012}
3013
3014sub _draw {
3015 my ($self) = @_;
3016
3017 $self->{current}->draw;
3018}
3019
3020#############################################################################
3021
3022package CFClient::UI::Notebook;
3023
3024our @ISA = CFClient::UI::VBox::;
3025
3026sub new {
3027 my $class = shift;
3028
3029 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3032 # filter => # will be put between multiplexer and $self
3033 @_,
3034 );
2871 } 3035
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3037 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3038
3039 $self
3040}
3041
3042sub add {
3043 my ($self, $title, $widget, $tooltip) = @_;
3044
3045 Scalar::Util::weaken $self;
3046
3047 $self->{buttonbar}->add (new CFClient::UI::Button
3048 markup => $title,
3049 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) },
3051 );
3052
3053 $self->{multiplexer}->add ($widget);
3054}
3055
3056sub set_current_page {
3057 my ($self, $page) = @_;
3058
3059 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current});
2872} 3061}
2873 3062
2874############################################################################# 3063#############################################################################
2875 3064
2876package CFClient::UI::Statusbox; 3065package CFClient::UI::Statusbox;
… …
2981 $self->SUPER::reconfigure; 3170 $self->SUPER::reconfigure;
2982} 3171}
2983 3172
2984############################################################################# 3173#############################################################################
2985 3174
2986package CFClient::UI::Root; 3175package CFClient::UI::Inventory;
2987 3176
2988our @ISA = CFClient::UI::Container::; 3177our @ISA = CFClient::UI::ScrolledWindow::;
2989
2990use CFClient::OpenGL;
2991 3178
2992sub new { 3179sub new {
2993 my $class = shift; 3180 my $class = shift;
2994 3181
2995 $class->SUPER::new ( 3182 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3184 @_,
3185 );
3186
3187 $self
3188}
3189
3190sub set_items {
3191 my ($self, $items) = @_;
3192
3193 $self->{child}->clear;
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 }
3410}
3411
3412#############################################################################
3413
3414package CFClient::UI::SpellList;
3415
3416our @ISA = CFClient::UI::Table::;
3417
3418sub new {
3419 my $class = shift;
3420
3421 my $self = $class->SUPER::new (
3422 binding => [],
3423 commands => [],
3424 @_,
3425 )
3426}
3427
3428# XXX: Do sorting? Argl...
3429sub add_spell {
3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
3432
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460}
3461
3462sub remove_spell {
3463 my ($self, $spell) = @_;
3464 delete $self->{spells}->{$spell->{name}};
3465 $self->rebuild_spell_list;
3466}
3467
3468#############################################################################
3469
3470package CFClient::UI::Root;
3471
3472our @ISA = CFClient::UI::Container::;
3473
3474use CFClient::OpenGL;
3475
3476sub new {
3477 my $class = shift;
3478
3479 my $self = $class->SUPER::new (
2996 visible => 1, 3480 visible => 1,
2997 @_, 3481 @_,
2998 ) 3482 );
2999}
3000 3483
3001sub configure { 3484 Scalar::Util::weaken ($self->{root} = $self);
3002 my ($self, $x, $y, $w, $h) = @_;
3003 3485
3004 $self->{w} = $w; 3486 $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} 3487}
3014 3488
3015sub size_request { 3489sub size_request {
3016 my ($self) = @_; 3490 my ($self) = @_;
3017 3491
3018 ($self->{w}, $self->{h}) 3492 ($self->{w}, $self->{h})
3493}
3494
3495sub _to_pixel {
3496 my ($coord, $size, $max) = @_;
3497
3498 $coord =
3499 $coord eq "center" ? ($max - $size) * 0.5
3500 : $coord eq "max" ? $max
3501 : $coord;
3502
3503 $coord = 0 if $coord < 0;
3504 $coord = $max - $size if $coord > $max - $size;
3505
3506 int $coord + 0.5
3019} 3507}
3020 3508
3021sub size_allocate { 3509sub size_allocate {
3022 my ($self, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
3023 3511
3024 for my $child ($self->children) { 3512 for my $child ($self->children) {
3025 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3026 3514
3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3515 $X = $child->{force_x} if exists $child->{force_x};
3028 if exists $child->{req_x}; 3516 $Y = $child->{force_y} if exists $child->{force_y};
3029 3517
3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3518 $X = _to_pixel $X, $W, $self->{w};
3031 if exists $child->{req_y}; 3519 $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 3520
3036 $child->configure ($X, $Y, $W, $H); 3521 $child->configure ($X, $Y, $W, $H);
3037 } 3522 }
3038} 3523}
3039 3524
… …
3050} 3535}
3051 3536
3052sub update { 3537sub update {
3053 my ($self) = @_; 3538 my ($self) = @_;
3054 3539
3055 $self->check_size;
3056 $::WANT_REFRESH++; 3540 $::WANT_REFRESH++;
3057} 3541}
3058 3542
3059sub add { 3543sub add {
3060 my ($self, @children) = @_; 3544 my ($self, @children) = @_;
3061 3545
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; 3546 $_->{is_toplevel} = 1
3070 3547 for @children;
3071 # integerise window positions
3072 $child->{x} = int $child->{x};
3073 $child->{y} = int $child->{y};
3074 }
3075 3548
3076 $self->SUPER::add (@children); 3549 $self->SUPER::add (@children);
3077} 3550}
3078 3551
3079sub remove { 3552sub remove {
3080 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
3081 3554
3082 $self->SUPER::remove (@children); 3555 $self->SUPER::remove (@children);
3556
3557 delete $self->{is_toplevel}
3558 for @children;
3083 3559
3084 while (@children) { 3560 while (@children) {
3085 my $w = pop @children; 3561 my $w = pop @children;
3086 push @children, $w->children; 3562 push @children, $w->children;
3087 $w->set_invisible; 3563 $w->set_invisible;
… …
3106 while ($self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
3107 $_->() 3583 $_->()
3108 for values %{delete $self->{refresh_hook}}; 3584 for values %{delete $self->{refresh_hook}};
3109 } 3585 }
3110 3586
3111 if ($self->{check_size}) { 3587 if ($self->{realloc}) {
3112 my @queue = ([], []); 3588 my %queue;
3589 my @queue;
3590 my $widget;
3113 3591
3114 for (;;) { 3592 outer:
3115 if ($self->{check_size}) { 3593 while () {
3116 # heuristic: check containers last 3594 if (my $realloc = delete $self->{realloc}) {
3117 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3595 for $widget (values %$realloc) {
3118 for values %{delete $self->{check_size}} 3596 $widget->{visible} or next; # do not resize invisible widgets
3597
3598 $queue{$widget+0}++ and next; # duplicates are common
3599
3600 push @{ $queue[$widget->{visible}] }, $widget;
3601 }
3119 } 3602 }
3120 3603
3121 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3604 while () {
3605 @queue or last outer;
3122 3606
3123 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3607 $widget = pop @{ $queue[-1] || [] }
3124 ? @$widget{qw(user_w user_h)} 3608 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 3609
3610 pop @queue;
3611 }
3612
3613 delete $queue{$widget+0};
3614
3615 my ($w, $h) = $widget->size_request;
3616
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3619
3620 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h};
3622
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3624 || delete $widget->{force_realloc}) {
3131 $widget->{req_w} = $w; 3625 $widget->{req_w} = $w;
3132 $widget->{req_h} = $h; 3626 $widget->{req_h} = $h;
3133 3627
3134 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3628 $self->{size_alloc}{$widget+0} = $widget;
3135 3629
3136 $widget->{parent}->check_size
3137 if $widget->{parent}; 3630 if (my $parent = $widget->{parent}) {
3631 $self->{realloc}{$parent+0} = $parent
3632 unless $queue{$parent+0};
3633
3634 $parent->{force_size_alloc} = 1;
3635 $self->{size_alloc}{$parent+0} = $parent;
3636 }
3138 } 3637 }
3638
3639 delete $self->{realloc}{$widget+0};
3139 } 3640 }
3140 } 3641 }
3141 3642
3142 while ($self->{size_alloc}) { 3643 while (my $size_alloc = delete $self->{size_alloc}) {
3143 for (values %{delete $self->{size_alloc}}) { 3644 my @queue = sort { $b->{visible} <=> $a->{visible} }
3144 my ($widget, $w, $h) = @$_; 3645 values %$size_alloc;
3646
3647 while () {
3648 my $widget = pop @queue || last;
3649
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145 3651
3146 $w = 0 if $w < 0; 3652 $w = 0 if $w < 0;
3147 $h = 0 if $h < 0; 3653 $h = 0 if $h < 0;
3148 3654
3655 $w = int $w + 0.5;
3656 $h = int $h + 0.5;
3657
3658 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3659 $widget->{old_w} = $widget->{w};
3660 $widget->{old_h} = $widget->{h};
3661
3149 $widget->{w} = $w; 3662 $widget->{w} = $w;
3150 $widget->{h} = $h; 3663 $widget->{h} = $h;
3664
3151 $widget->emit (size_allocate => $w, $h); 3665 $widget->emit (size_allocate => $w, $h);
3666 }
3152 } 3667 }
3153 } 3668 }
3154 3669
3155 while ($self->{post_alloc_hook}) { 3670 while ($self->{post_alloc_hook}) {
3156 $_->() 3671 $_->()
3157 for values %{delete $self->{post_alloc_hook}}; 3672 for values %{delete $self->{post_alloc_hook}};
3158 } 3673 }
3674
3159 3675
3160 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3161 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3162 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
3163 3679
… …
3165 glLoadIdentity; 3681 glLoadIdentity;
3166 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3167 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
3168 glLoadIdentity; 3684 glLoadIdentity;
3169 3685
3686 {
3687 package CFClient::UI::Base;
3688
3689 ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h});
3691 }
3692
3170 $self->_draw; 3693 $self->_draw;
3171} 3694}
3172 3695
3173############################################################################# 3696#############################################################################
3174 3697

Diff Legend

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