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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

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

Diff Legend

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