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

Diff Legend

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