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

Diff Legend

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