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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.319 by root, Sun Jul 2 21:07:26 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 76 if $FOCUS;
75} 77}
… …
87 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
88 90
89 $GRAB = $widget; 91 $GRAB = $widget;
90 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
91 93
92 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
93 } 95 }
94 96
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 98
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
112 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 116 $grab->update if $grab;
115 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
116 118
117 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
118 } 120 }
119} 121}
120 122
121sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
122 my ($ev) = @_; 124 my ($ev) = @_;
… …
128 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
129 131
130 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 134
133 check_tooltip; 135 $TOOLTIP_WATCHER->start;
134 } 136 }
135 137
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 139 if $HOVER;
138} 140}
… …
170sub rescale_widgets { 172sub rescale_widgets {
171 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
172 174
173 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 179
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 186
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 189
188 } 190 }
189 } 191 }
190 192
191 reconfigure_widgets; 193 reconfigure_widgets;
… …
219 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
220 } 222 }
221 } 223 }
222 224
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x}; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y}; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w}; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h}; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228 230
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231 233
232 $self->show if $layout->{show}; 234 $self->show if $layout->{show};
… …
270 272
271 return unless $self->{visible}; 273 return unless $self->{visible};
272 274
273 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
274 276
277 delete $self->{visible};
275 delete $self->{root}; 278 delete $self->{root};
276 delete $self->{visible};
277 279
278 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
280 282
281 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
283 285
284 $self->focus_out; 286 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
287} 288}
288 289
289sub set_visibility { 290sub set_visibility {
290 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
313} 314}
314 315
315sub move_abs { 316sub move_abs {
316 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
317 318
318 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
321 322
322 $self->update; 323 $self->update;
323} 324}
324 325
… …
332} 333}
333 334
334sub size_request { 335sub size_request {
335 require Carp; 336 require Carp;
336 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
337} 342}
338 343
339sub configure { 344sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
341 346
… …
355 $self->{x} = $x; 360 $self->{x} = $x;
356 $self->{y} = $y; 361 $self->{y} = $y;
357 $self->update; 362 $self->update;
358 } 363 }
359 364
360 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible}; 366 return unless $self->{visible};
362 367
368 $self->{alloc_w} = $w;
369 $self->{alloc_h} = $h;
370
363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 371 $self->{root}{size_alloc}{$self+0} = $self;
364 } 372 }
365}
366
367sub size_allocate {
368 # nothing to be done
369} 373}
370 374
371sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
372} 381}
373 382
374sub set_max_size { 383sub set_max_size {
375 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
376 385
377 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
378 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
379} 390}
380 391
381sub set_tooltip { 392sub set_tooltip {
382 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
383 394
… …
388 399
389 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
390 401
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
394 } 405 }
395} 406}
396 407
397# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
398sub coord2local { 409sub coord2local {
… …
406 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
407 418
408 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
409} 420}
410 421
411sub focus_in { 422sub invoke_focus_in {
412 my ($self) = @_; 423 my ($self) = @_;
413 424
414 return if $FOCUS == $self; 425 return if $FOCUS == $self;
415 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
416 427
417 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
418 429
419 $self->_emit (focus_in => $focus); 430 $self->update;
420 431
421 $focus->update if $focus; 432 0
422 $FOCUS->update;
423} 433}
424 434
425sub focus_out { 435sub invoke_focus_out {
426 my ($self) = @_; 436 my ($self) = @_;
427 437
428 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
429 439
430 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
431 441
432 $self->_emit (focus_out => $focus); 442 $self->update;
433 443
434 $focus->update if $focus; #?
435
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
437 unless $FOCUS; 445 unless $FOCUS;
438}
439 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
440sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
441sub button_up { } 458sub invoke_button_up { 1 }
442sub key_down { } 459sub invoke_key_down { 1 }
443sub key_up { } 460sub invoke_key_up { 1 }
444 461
445sub button_down { 462sub invoke_button_down {
446 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
447 464
448 $self->focus_in; 465 $self->grab_focus;
449}
450 466
451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
456 484
457sub find_widget { 485sub find_widget {
458 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
459 487
460 return () unless $self->{can_events}; 488 return () unless $self->{can_events};
… …
471 499
472 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
474} 502}
475 503
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc { 504sub realloc {
500 my ($self) = @_; 505 my ($self) = @_;
501 506
502 if ($self->{visible}) { 507 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self}; 508 return if $self->{root}{realloc}{$self+0};
504 509
505 $self->{root}{realloc}{$self} = $self; 510 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update; 511 $self->{root}->update;
507 } else { 512 } else {
508 delete $self->{req_w}; 513 delete $self->{req_w};
514 delete $self->{req_h};
509 } 515 }
510} 516}
511 517
512sub update { 518sub update {
513 my ($self) = @_; 519 my ($self) = @_;
… …
521 527
522 $self->realloc; 528 $self->realloc;
523 $self->update; 529 $self->update;
524} 530}
525 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
535
526sub draw { 536sub draw {
527 my ($self) = @_; 537 my ($self) = @_;
528 538
529 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
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
530 548
531 glPushMatrix; 549 glPushMatrix;
532 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
533 $self->_draw;
534 glPopMatrix;
535 551
536 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
537 my ($x, $y) = @$self{qw(x y)};
538
539 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
540 glEnable GL_BLEND; 554 glEnable GL_BLEND;
541 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542 glBegin GL_QUADS; 556 glBegin GL_QUADS;
543 glVertex $x , $y; 557 glVertex 0 , 0;
544 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
545 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
546 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
547 glEnd; 561 glEnd;
548 glDisable GL_BLEND; 562 glDisable GL_BLEND;
549 } 563 }
550 564
551 if ($ENV{CFPLUS_DEBUG}) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
552 glPushMatrix; 566 glPushMatrix;
553 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
555 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
556 glVertex 0 , 0; 570 glVertex 0 , 0;
557 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
558 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
559 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
560 glEnd; 574 glEnd;
561 glPopMatrix; 575 glPopMatrix;
562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
563 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
564} 581}
565 582
566sub _draw { 583sub _draw {
567 my ($self) = @_; 584 my ($self) = @_;
568 585
… …
571 588
572sub DESTROY { 589sub DESTROY {
573 my ($self) = @_; 590 my ($self) = @_;
574 591
575 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
576 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
577} 596}
578 597
579############################################################################# 598#############################################################################
580 599
581package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
606 625
607 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
608 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
609 628
610 glEnable GL_BLEND; 629 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glColor @$color; 631 glColor_premultiply @$color;
613 632
614 glBegin GL_QUADS; 633 glBegin GL_QUADS;
615 glVertex 0 , 0; 634 glVertex 0 , 0;
616 glVertex 0 , $h; 635 glVertex 0 , $h;
617 glVertex $w, $h; 636 glVertex $w, $h;
… …
648our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
649 668
650sub new { 669sub new {
651 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
652 671
653 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
654 673
655 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
656 children => [], 675 children => [],
657 can_events => 0, 676 can_events => 0,
658 %arg, 677 %arg,
659 ); 678 );
679
660 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
661 682
662 $self 683 $self
663} 684}
664 685
665sub add { 686sub add {
… …
713 $x -= $self->{x}; 734 $x -= $self->{x};
714 $y -= $self->{y}; 735 $y -= $self->{y};
715 736
716 my $res; 737 my $res;
717 738
718 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
719 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
720 and return $res; 741 and return $res;
721 } 742 }
722 743
723 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
744} 765}
745 766
746sub add { 767sub add {
747 my ($self, $child) = @_; 768 my ($self, $child) = @_;
748 769
749 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
750
751 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
752} 772}
753 773
754sub remove { 774sub remove {
755 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
764 784
765sub size_request { 785sub size_request {
766 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
767} 787}
768 788
769sub size_allocate { 789sub invoke_size_allocate {
770 my ($self, $w, $h, $changed) = @_; 790 my ($self, $w, $h) = @_;
771 791
772 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
773} 795}
774 796
775############################################################################# 797#############################################################################
798
799# back-buffered drawing area
776 800
777package CFClient::UI::Window; 801package CFClient::UI::Window;
778 802
779our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
780 804
… …
791 815
792 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
793 $self->SUPER::update; 817 $self->SUPER::update;
794} 818}
795 819
796sub size_allocate { 820sub invoke_size_allocate {
797 my ($self, $w, $h, $changed) = @_; 821 my ($self, $w, $h) = @_;
798 822
799 $self->SUPER::size_allocate ($w, $h, $changed);
800 $self->update 823 $self->update;
801 if $changed; 824
825 $self->SUPER::invoke_size_allocate ($w, $h)
802} 826}
803 827
804sub _render { 828sub _render {
829 my ($self) = @_;
830
805 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
806} 832}
807 833
808sub render_child { 834sub render_child {
809 my ($self) = @_; 835 my ($self) = @_;
810 836
811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
812 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
813 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
814 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
815 $self->_render; 848 $self->_render;
816 }; 849 };
817} 850}
818 851
819sub _draw { 852sub _draw {
820 my ($self) = @_; 853 my ($self) = @_;
821 854
822 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
823 856
824 my $tex = $self->{texture} 857 my $tex = $self->{texture}
825 or return; 858 or return;
826 859
827 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
830 863
831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
832 865
833 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
834} 867}
… …
850} 883}
851 884
852sub size_request { 885sub size_request {
853 my ($self) = @_; 886 my ($self) = @_;
854 887
855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856 889
857 $w = 10 if $self->{scroll_x}; 890 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
859 892
860 ($w, $h) 893 ($w, $h)
861} 894}
862 895
863sub size_allocate { 896sub invoke_size_allocate {
864 my ($self, $w, $h, $changed) = @_; 897 my ($self, $w, $h) = @_;
865 898
899 my $child = $self->child;
900
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868 903
869 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
870 $self->update; 905 $self->update;
906
907 1
871} 908}
872 909
873sub set_offset { 910sub set_offset {
874 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
875 912
… …
908} 945}
909 946
910sub _render { 947sub _render {
911 my ($self) = @_; 948 my ($self) = @_;
912 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
913 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914 954
915 $self->SUPER::_render; 955 $self->SUPER::_render;
916} 956}
917 957
… …
920package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
921 961
922our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
923 963
924sub new { 964sub new {
925 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
926 968
927 my $self; 969 my $self;
928 970
929 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
930 vertical => 1, 972 vertical => 1,
… …
935 ; 977 ;
936 978
937 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
938 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
939 slider => $slider, 981 slider => $slider,
940 @_, 982 %arg,
941 ); 983 );
942 984
943 $self->{vp}->add ($self->{scrolled});
944 $self->add ($self->{vp});
945 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
946 987
947 $self 988 $self
948} 989}
949 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
950sub update { 1005sub update {
951 my ($self) = @_; 1006 my ($self) = @_;
952 1007
953 $self->SUPER::update; 1008 $self->SUPER::update;
954 1009
955 # todo: overwrite size_allocate of child 1010 $self->update_slider;
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1011}
959 1012
960sub size_allocate { 1013sub invoke_size_allocate {
961 my ($self, $w, $h, $changed) = @_; 1014 my ($self, $w, $h) = @_;
962 1015
1016 $self->update_slider;
1017
963 $self->SUPER::size_allocate ($w, $h, $changed); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
964
965 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967} 1019}
968
969#TODO# update range on size_allocate depending on child
970# update viewport offset on scroll
971 1020
972############################################################################# 1021#############################################################################
973 1022
974package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
975 1024
… …
991 1040
992 if ($self->{bg}) { 1041 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
994 1043
995 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
998 1047
999 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
1000 glVertex 0 , 0; 1049 glVertex 0 , 0;
1001 glVertex 0 , $h; 1050 glVertex 0 , $h;
1002 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1024my @border = 1073my @border =
1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027 1076
1028sub new { 1077sub new {
1029 my $class = shift; 1078 my ($class, %arg) = @_;
1030 1079
1031 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1032 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1033 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1034 border => 0.6, 1083 border => 0.6,
1035 can_events => 1, 1084 can_events => 1,
1036 min_w => 16, 1085 min_w => 16,
1037 min_h => 16, 1086 min_h => 16,
1038 @_ 1087 %arg,
1039 ); 1088 );
1040 1089
1041 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1042 align => 0, 1091 align => 0,
1043 valign => 1, 1092 valign => 1,
1044 text => $self->{title}, 1093 text => $self->{title},
1045 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1046 1105
1047 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1048} 1115}
1049 1116
1050sub border { 1117sub border {
1051 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1052} 1119}
1053 1120
1054sub size_request { 1121sub size_request {
1055 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1056 1129
1057 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1058 1131
1059 ( 1132 (
1060 $w + $self->border * 2, 1133 $w + $self->border * 2,
1061 $h + $self->border * 2, 1134 $h + $self->border * 2,
1062 ) 1135 )
1063} 1136}
1064 1137
1065sub size_allocate { 1138sub invoke_size_allocate {
1066 my ($self, $w, $h, $changed) = @_; 1139 my ($self, $w, $h) = @_;
1067 1140
1068 return unless $changed; 1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1069 1146
1147 my $border = $self->border;
1148
1070 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1071 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1072 1151
1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1074 if $self->{title};
1075
1076 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1077}
1078 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1165 1
1166}
1167
1079sub button_down { 1168sub invoke_button_down {
1080 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1081 1170
1082 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1083 my $border = $self->border; 1172 my $border = $self->border;
1084 1173
… …
1100 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
1101 1190
1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104 1193
1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105 $self->realloc; 1195 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107 }; 1196 };
1108 1197
1109 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
1110 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111 my ($bx, $by) = ($self->{x}, $self->{y}); 1200 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1114 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
1115 1204
1116 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1117 1206
1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1208 # HACK: the next line is required to enforce placement
1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119 }; 1210 };
1211 } else {
1212 return 0;
1213 }
1214
1120 } 1215 1
1121} 1216}
1122 1217
1123sub button_up { 1218sub invoke_button_up {
1124 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1125 1220
1126 delete $self->{motion}; 1221 ! ! delete $self->{motion}
1127} 1222}
1128 1223
1129sub mouse_motion { 1224sub invoke_mouse_motion {
1130 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1131 1226
1132 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228
1229 ! ! $self->{motion}
1133} 1230}
1134 1231
1135sub _draw { 1232sub _draw {
1136 my ($self) = @_; 1233 my ($self) = @_;
1137 1234
1235 my $child = $self->{children}[0];
1236
1138 my ($w, $h ) = ($self->{w}, $self->{h}); 1237 my ($w, $h ) = ($self->{w}, $self->{h});
1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1238 my ($cw, $ch) = ($child->{w}, $child->{h});
1140 1239
1141 glEnable GL_TEXTURE_2D; 1240 glEnable GL_TEXTURE_2D;
1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143 1242
1144 my $border = $self->border; 1243 my $border = $self->border;
… …
1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1258 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 } 1259 }
1161 1260
1162 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1163 1262
1164 $self->{title}->draw if $self->{title};
1165
1166 $self->child->draw; 1263 $child->draw;
1264
1265 if ($self->{title_widget}) {
1266 glTranslate 0, $border - $self->{h};
1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1167} 1274}
1168 1275
1169############################################################################# 1276#############################################################################
1170 1277
1171package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1194 1301
1195 $child->set_parent ($self); 1302 $child->set_parent ($self);
1196 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1197 1304
1198 $self->realloc; 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1199} 1312}
1200 1313
1201# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1202sub clear { 1315sub clear {
1203 my ($self) = @_; 1316 my ($self) = @_;
… …
1244 (sum @$ws), 1357 (sum @$ws),
1245 (sum @$hs), 1358 (sum @$hs),
1246 ) 1359 )
1247} 1360}
1248 1361
1249sub size_allocate { 1362sub invoke_size_allocate {
1250 my ($self, $w, $h, $changed) = @_; 1363 my ($self, $w, $h) = @_;
1251 1364
1252 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1253 1366
1254 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
1255 my $req_h = (sum @$hs) || 1; 1368 my $req_h = (sum @$hs) || 1;
… …
1286 } 1399 }
1287 1400
1288 $y += $row_h; 1401 $y += $row_h;
1289 } 1402 }
1290 1403
1404 1
1291} 1405}
1292 1406
1293sub find_widget { 1407sub find_widget {
1294 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1295 1409
… …
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 ) 1448 )
1335} 1449}
1336 1450
1337sub size_allocate { 1451sub invoke_size_allocate {
1338 my ($self, $w, $h, $changed) = @_; 1452 my ($self, $w, $h) = @_;
1339 1453
1340 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1342 1456
1343 my @req; 1457 my @req;
1344 1458
1345 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1347 } else { 1461 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1349 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1350 1464
1351 if ($req > $space) { 1465 if ($req > $space) {
1352 # ah well, not enough space 1466 # ah well, not enough space
1353 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1354 } else { 1468 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1356 1470
1357 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1358 1472
1359 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1360 for 0 .. $#$children; 1474 for 0 .. $#children;
1361 } 1475 }
1362 } 1476 }
1363 1477
1364 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1365 1479
1366 my $pos = 0; 1480 my $pos = 0;
1367 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1368 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370 1484
1371 $pos += $alloc; 1485 $pos += $alloc;
1372 } 1486 }
1373 1487
1374 1 1488 1
… …
1464 1578
1465 delete $self->{texture}; 1579 delete $self->{texture};
1466 $self->SUPER::update; 1580 $self->SUPER::update;
1467} 1581}
1468 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1469sub set_text { 1590sub set_text {
1470 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1471 1592
1472 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1473 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1474 1595
1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1476 $self->{layout}->set_text ($text); 1597 $self->{layout}->set_text ($text);
1477 1598
1599 delete $self->{size_req};
1478 $self->realloc; 1600 $self->realloc;
1479 $self->update; 1601 $self->update;
1480} 1602}
1481 1603
1482sub set_markup { 1604sub set_markup {
… …
1488 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1610 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489 1611
1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1491 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1492 1614
1615 delete $self->{size_req};
1493 $self->realloc; 1616 $self->realloc;
1494 $self->update; 1617 $self->update;
1495} 1618}
1496 1619
1497sub size_request { 1620sub size_request {
1498 my ($self) = @_; 1621 my ($self) = @_;
1499 1622
1623 $self->{size_req} ||= do {
1500 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1501 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1629
1506 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1507 1631
1508 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1509 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1510 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1635
1512 my ($w2, $h2) = $self->{template}->size; 1636 my ($w2, $h2) = $self->{template}->size;
1513 1637
1514 $w = List::Util::max $w, $w2; 1638 $w = List::Util::max $w, $w2;
1515 $h = List::Util::max $h, $h2; 1639 $h = List::Util::max $h, $h2;
1640 }
1641
1642 [$w, $h]
1516 } 1643 };
1517 1644
1518 ($w, $h) 1645 @{ $self->{size_req} }
1519} 1646}
1520 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1521sub size_allocate { 1652sub invoke_size_allocate {
1522 my ($self, $w, $h, $changed) = @_; 1653 my ($self, $w, $h) = @_;
1654
1655 delete $self->{ox};
1523 1656
1524 delete $self->{texture} 1657 delete $self->{texture}
1525 if $changed; 1658 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1659
1660 1
1526} 1661}
1527 1662
1528sub set_fontsize { 1663sub set_fontsize {
1529 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1530 1665
1531 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1532 delete $self->{texture}; 1668 delete $self->{texture};
1533 1669
1534 $self->realloc; 1670 $self->realloc;
1671}
1672
1673sub reconfigure {
1674 my ($self) = @_;
1675
1676 delete $self->{size_req};
1677
1678 $self->SUPER::reconfigure;
1535} 1679}
1536 1680
1537sub _draw { 1681sub _draw {
1538 my ($self) = @_; 1682 my ($self) = @_;
1539 1683
… …
1545 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549 1693
1550 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1694 new_from_layout CFClient::Texture $self->{layout}
1695 };
1551 1696
1697 unless (exists $self->{ox}) {
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $tex->{w}) * 0.5);
1555 1701
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $tex->{h}) * 0.5);
1559
1560 $tex
1561 }; 1705 };
1562 1706
1563 glEnable GL_TEXTURE_2D; 1707 glEnable GL_TEXTURE_2D;
1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1565 1711
1566 if ($tex->{format} == GL_ALPHA) { 1712 if ($tex->{format} == GL_ALPHA) {
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1567 glColor @{$self->{fg}}; 1714 glColor @{$self->{fg}};
1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1569 } else { 1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1571 } 1719 }
1572 1720
1573 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1574} 1722}
1575 1723
… …
1592 can_hover => 1, 1740 can_hover => 1,
1593 can_focus => 1, 1741 can_focus => 1,
1594 valign => 0, 1742 valign => 0,
1595 can_events => 1, 1743 can_events => 1,
1596 #text => ... 1744 #text => ...
1745 #hidden => "*",
1597 @_ 1746 @_
1598 ) 1747 )
1599} 1748}
1600 1749
1601sub _set_text { 1750sub _set_text {
… …
1603 1752
1604 delete $self->{cur_h}; 1753 delete $self->{cur_h};
1605 1754
1606 return if $self->{text} eq $text; 1755 return if $self->{text} eq $text;
1607 1756
1608 delete $self->{texture};
1609
1610 $self->{last_activity} = $::NOW; 1757 $self->{last_activity} = $::NOW;
1611 $self->{text} = $text; 1758 $self->{text} = $text;
1612 1759
1613 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1614 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1762 delete $self->{size_req};
1615 1763
1616 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1765
1766 $self->realloc;
1767 $self->update;
1617} 1768}
1618 1769
1619sub set_text { 1770sub set_text {
1620 my ($self, $text) = @_; 1771 my ($self, $text) = @_;
1621 1772
1622 $self->{cursor} = length $text; 1773 $self->{cursor} = length $text;
1623 $self->_set_text ($text); 1774 $self->_set_text ($text);
1624
1625 $self->realloc;
1626} 1775}
1627 1776
1628sub get_text { 1777sub get_text {
1629 $_[0]{text} 1778 $_[0]{text}
1630} 1779}
… …
1635 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1636 1785
1637 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1638} 1787}
1639 1788
1640sub key_down { 1789sub invoke_key_down {
1641 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1642 1791
1643 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1644 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1645 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
… …
1657 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1658 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1659 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1660 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1661 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1662 $self->_emit ('escape'); 1811 $self->emit ('escape');
1663 } elsif ($uni) { 1812 } elsif ($uni) {
1664 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1814 } else {
1815 return 0;
1665 } 1816 }
1666 1817
1667 $self->_set_text ($text); 1818 $self->_set_text ($text);
1668 1819
1669 $self->realloc; 1820 $self->realloc;
1670}
1671 1821
1822 1
1823}
1824
1672sub focus_in { 1825sub invoke_focus_in {
1673 my ($self) = @_; 1826 my ($self) = @_;
1674 1827
1675 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1676 1829
1677 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1678} 1831}
1679 1832
1680sub button_down { 1833sub invoke_button_down {
1681 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1682 1835
1683 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1684 1837
1685 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1686 1839
1687 # byte-index to char-index 1840 # byte-index to char-index
1688 my $text = $self->{text}; 1841 my $text = $self->{text};
1689 utf8::encode $text; 1842 utf8::encode $text;
1690 $self->{cursor} = length substr $text, 0, $idx; 1843 $self->{cursor} = length substr $text, 0, $idx;
1691 1844
1692 $self->_set_text ($self->{text}); 1845 $self->_set_text ($self->{text});
1693 $self->update; 1846 $self->update;
1847
1848 1
1694} 1849}
1695 1850
1696sub mouse_motion { 1851sub invoke_mouse_motion {
1697 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1698# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1853# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1854
1855 1
1699} 1856}
1700 1857
1701sub _draw { 1858sub _draw {
1702 my ($self) = @_; 1859 my ($self) = @_;
1703 1860
1704 local $self->{fg} = $self->{fg}; 1861 local $self->{fg} = $self->{fg};
1705 1862
1706 if ($FOCUS == $self) { 1863 if ($FOCUS == $self) {
1707 glColor @{$self->{active_bg}}; 1864 glColor_premultiply @{$self->{active_bg}};
1708 $self->{fg} = $self->{active_fg}; 1865 $self->{fg} = $self->{active_fg};
1709 } else { 1866 } else {
1710 glColor @{$self->{bg}}; 1867 glColor_premultiply @{$self->{bg}};
1711 } 1868 }
1712 1869
1713 glEnable GL_BLEND; 1870 glEnable GL_BLEND;
1714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1871 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715 glBegin GL_QUADS; 1872 glBegin GL_QUADS;
1716 glVertex 0 , 0; 1873 glVertex 0 , 0;
1717 glVertex 0 , $self->{h}; 1874 glVertex 0 , $self->{h};
1718 glVertex $self->{w}, $self->{h}; 1875 glVertex $self->{w}, $self->{h};
1719 glVertex $self->{w}, 0; 1876 glVertex $self->{w}, 0;
… …
1744 1901
1745our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1746 1903
1747use CFClient::OpenGL; 1904use CFClient::OpenGL;
1748 1905
1749sub key_down { 1906sub invoke_key_down {
1750 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1751 1908
1752 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1753 1910
1754 if ($sym == 13) { 1911 if ($sym == 13) {
1755 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1756 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1757 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1758 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1759 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1760 $self->update; 1918 $self->update;
1761 1919
1762 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1763 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1764 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
… …
1780 } else { 1938 } else {
1781 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1782 } 1940 }
1783 1941
1784 } else { 1942 } else {
1785 $self->SUPER::key_down ($ev); 1943 return $self->SUPER::invoke_key_down ($ev)
1944 }
1945
1786 } 1946 1
1787
1788} 1947}
1789 1948
1790############################################################################# 1949#############################################################################
1791 1950
1792package CFClient::UI::Button; 1951package CFClient::UI::Button;
… …
1813 can_events => 1, 1972 can_events => 1,
1814 @_ 1973 @_
1815 ) 1974 )
1816} 1975}
1817 1976
1818sub activate { }
1819
1820sub button_up { 1977sub invoke_button_up {
1821 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1822 1979
1823 $self->emit ("activate") 1980 $self->emit ("activate")
1824 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1825 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
1983
1984 1
1826} 1985}
1827 1986
1828sub _draw { 1987sub _draw {
1829 my ($self) = @_; 1988 my ($self) = @_;
1830 1989
1831 local $self->{fg} = $self->{fg}; 1990 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833 if ($GRAB == $self) {
1834 $self->{fg} = $self->{active_fg};
1835 }
1836 1991
1837 glEnable GL_TEXTURE_2D; 1992 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 glColor 0, 0, 0, 1; 1994 glColor 0, 0, 0, 1;
1840 1995
1841 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1996 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1842 1997
1843 glDisable GL_TEXTURE_2D; 1998 glDisable GL_TEXTURE_2D;
1844 1999
1845 $self->SUPER::_draw; 2000 $self->SUPER::_draw;
2001}
2002
2003#############################################################################
2004
2005package CFClient::UI::ImageButton;
2006
2007our @ISA = CFClient::UI::Image::;
2008
2009use CFClient::OpenGL;
2010
2011my %textures;
2012
2013sub new {
2014 my $class = shift;
2015
2016 my $self = $class->SUPER::new (
2017 padding_x => 4,
2018 padding_y => 4,
2019 fg => [1, 1, 1],
2020 active_fg => [0, 0, 1],
2021 can_hover => 1,
2022 align => 0,
2023 valign => 0,
2024 can_events => 1,
2025 @_
2026 );
2027}
2028
2029sub invoke_button_up {
2030 my ($self, $ev, $x, $y) = @_;
2031
2032 $self->emit ("activate")
2033 if $x >= 0 && $x < $self->{w}
2034 && $y >= 0 && $y < $self->{h};
2035
2036 1
1846} 2037}
1847 2038
1848############################################################################# 2039#############################################################################
1849 2040
1850package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
… …
1877 my ($self) = @_; 2068 my ($self) = @_;
1878 2069
1879 (6) x 2 2070 (6) x 2
1880} 2071}
1881 2072
2073sub toggle {
2074 my ($self) = @_;
2075
2076 $self->{state} = !$self->{state};
2077 $self->emit (changed => $self->{state});
2078 $self->update;
2079}
2080
1882sub button_down { 2081sub invoke_button_down {
1883 my ($self, $ev, $x, $y) = @_; 2082 my ($self, $ev, $x, $y) = @_;
1884 2083
1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2084 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2085 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887 $self->{state} = !$self->{state}; 2086 $self->toggle;
1888 $self->_emit (changed => $self->{state}); 2087 } else {
2088 return 0
2089 }
2090
1889 } 2091 1
1890} 2092}
1891 2093
1892sub _draw { 2094sub _draw {
1893 my ($self) = @_; 2095 my ($self) = @_;
1894 2096
… …
1914package CFClient::UI::Image; 2116package CFClient::UI::Image;
1915 2117
1916our @ISA = CFClient::UI::Base::; 2118our @ISA = CFClient::UI::Base::;
1917 2119
1918use CFClient::OpenGL; 2120use CFClient::OpenGL;
1919use Carp qw/confess/;
1920 2121
1921our %loaded_images; 2122our %texture_cache;
1922 2123
1923sub new { 2124sub new {
1924 my $class = shift; 2125 my $class = shift;
1925 2126
1926 my $self = $class->SUPER::new (can_events => 0, @_); 2127 my $self = $class->SUPER::new (
2128 can_events => 0,
2129 @_,
2130 );
1927 2131
1928 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2132 $self->{path}
2133 or Carp::croak "required attribute 'path' not set";
1929 2134
1930 $loaded_images{$self->{image}} ||= 2135 $self->{tex} = $texture_cache{$self->{path}} ||=
1931 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1932 2137
1933 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2138 Scalar::Util::weaken $texture_cache{$self->{path}};
1934 2139
1935 Scalar::Util::weaken $loaded_images{$self->{image}}; 2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1936
1937 $self->{aspect} = $tex->{w} / $tex->{h};
1938 2141
1939 $self 2142 $self
1940} 2143}
1941 2144
1942sub size_request { 2145sub size_request {
1943 my ($self) = @_; 2146 my ($self) = @_;
1944 2147
1945 ($self->{tex}->{w}, $self->{tex}->{h}) 2148 ($self->{tex}{w}, $self->{tex}{h})
1946} 2149}
1947 2150
1948sub _draw { 2151sub _draw {
1949 my ($self) = @_; 2152 my ($self) = @_;
1950 2153
… …
2059 my $ycut1 = max 0, min 1, $ycut; 2262 my $ycut1 = max 0, min 1, $ycut;
2060 my $ycut2 = max 0, min 1, $ycut - 1; 2263 my $ycut2 = max 0, min 1, $ycut - 1;
2061 2264
2062 my $h1 = $self->{h} * (1 - $ycut1); 2265 my $h1 = $self->{h} * (1 - $ycut1);
2063 my $h2 = $self->{h} * (1 - $ycut2); 2266 my $h2 = $self->{h} * (1 - $ycut2);
2267 my $h3 = $self->{h};
2268
2269 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2064 2270
2065 glEnable GL_BLEND; 2271 glEnable GL_BLEND;
2066 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2272 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2273 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
2068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069 2276
2070 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2277 glBindTexture GL_TEXTURE_2D, $t1->{name};
2071 glBegin GL_QUADS; 2278 glBegin GL_QUADS;
… …
2086 2293
2087 if ($t3) { 2294 if ($t3) {
2088 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2295 glBindTexture GL_TEXTURE_2D, $t3->{name};
2089 glBegin GL_QUADS; 2296 glBegin GL_QUADS;
2090 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2297 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2091 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2298 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2092 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2299 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2093 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2300 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2094 glEnd; 2301 glEnd;
2095 } 2302 }
2096 2303
2097 glDisable GL_BLEND; 2304 glDisable GL_BLEND;
… …
2185 $self->update; 2392 $self->update;
2186 2393
2187 $self 2394 $self
2188} 2395}
2189 2396
2190sub changed { }
2191
2192sub set_range { 2397sub set_range {
2193 my ($self, $range) = @_; 2398 my ($self, $range) = @_;
2194 2399
2195 ($range, $self->{range}) = ($self->{range}, $range); 2400 ($range, $self->{range}) = ($self->{range}, $range);
2196 2401
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}"; 2402 if ("@$range" ne "@{$self->{range}}") {
2403 $self->update;
2404 $self->set_value ($self->{range}[0]);
2405 }
2199} 2406}
2200 2407
2201sub set_value { 2408sub set_value {
2202 my ($self, $value) = @_; 2409 my ($self, $value) = @_;
2203 2410
… …
2214 if $unit; 2421 if $unit;
2215 2422
2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2423 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217 2424
2218 if ($value != $old_value) { 2425 if ($value != $old_value) {
2219 $self->_emit (changed => $value); 2426 $self->emit (changed => $value);
2220 $self->update; 2427 $self->update;
2221 } 2428 }
2222} 2429}
2223 2430
2224sub size_request { 2431sub size_request {
2225 my ($self) = @_; 2432 my ($self) = @_;
2226 2433
2227 ($self->{req_w}, $self->{req_h}) 2434 ($self->{req_w}, $self->{req_h})
2228} 2435}
2229 2436
2230sub button_down { 2437sub invoke_button_down {
2231 my ($self, $ev, $x, $y) = @_; 2438 my ($self, $ev, $x, $y) = @_;
2232 2439
2233 $self->SUPER::button_down ($ev, $x, $y); 2440 $self->SUPER::invoke_button_down ($ev, $x, $y);
2234 2441
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2442 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236 2443
2237 $self->mouse_motion ($ev, $x, $y); 2444 $self->invoke_mouse_motion ($ev, $x, $y)
2238} 2445}
2239 2446
2240sub mouse_motion { 2447sub invoke_mouse_motion {
2241 my ($self, $ev, $x, $y) = @_; 2448 my ($self, $ev, $x, $y) = @_;
2242 2449
2243 if ($GRAB == $self) { 2450 if ($GRAB == $self) {
2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2451 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245 2452
2246 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2453 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247 2454
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2455 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249 2456
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2457 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2458 } else {
2459 return 0;
2460 }
2461
2251 } 2462 1
2252} 2463}
2253 2464
2254sub update { 2465sub update {
2255 my ($self) = @_; 2466 my ($self) = @_;
2256 2467
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2468 delete $self->{knob_w};
2469 $self->SUPER::update;
2470}
2471
2472sub _draw {
2473 my ($self) = @_;
2474
2475 unless ($self->{knob_w}) {
2258 $self->set_value ($self->{range}[0]); 2476 $self->set_value ($self->{range}[0]);
2259 2477
2260 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2478 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100; 2479 my $range = ($hi - $page - $lo) || 1e-100;
2262 2480
… …
2268 $value = ($value - $lo) / $range; 2486 $value = ($value - $lo) / $range;
2269 $value = $value * $self->{scale} + $self->{offset}; 2487 $value = $value * $self->{scale} + $self->{offset};
2270 2488
2271 $self->{knob_x} = $value - $knob_w * 0.5; 2489 $self->{knob_x} = $value - $knob_w * 0.5;
2272 $self->{knob_w} = $knob_w; 2490 $self->{knob_w} = $knob_w;
2273 }); 2491 }
2274
2275 $self->SUPER::update;
2276}
2277
2278sub _draw {
2279 my ($self) = @_;
2280 2492
2281 $self->SUPER::_draw (); 2493 $self->SUPER::_draw ();
2282 2494
2283 glScale $self->{w}, $self->{h}; 2495 glScale $self->{w}, $self->{h};
2284 2496
… …
2345sub set_range { shift->{slider}->set_range (@_) } 2557sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) } 2558sub set_value { shift->{slider}->set_value (@_) }
2347 2559
2348############################################################################# 2560#############################################################################
2349 2561
2350package CFClient::UI::TextView; 2562package CFClient::UI::TextScroller;
2351 2563
2352our @ISA = CFClient::UI::HBox::; 2564our @ISA = CFClient::UI::HBox::;
2353 2565
2354use CFClient::OpenGL; 2566use CFClient::OpenGL;
2355 2567
… …
2357 my $class = shift; 2569 my $class = shift;
2358 2570
2359 my $self = $class->SUPER::new ( 2571 my $self = $class->SUPER::new (
2360 fontsize => 1, 2572 fontsize => 1,
2361 can_events => 0, 2573 can_events => 0,
2574 indent => 0,
2362 #font => default_font 2575 #font => default_font
2363 @_, 2576 @_,
2364 2577
2365 layout => (new CFClient::Layout 1), 2578 layout => (new CFClient::Layout 1),
2366 par => [], 2579 par => [],
… …
2381 2594
2382 $self->{fontsize} = $fontsize; 2595 $self->{fontsize} = $fontsize;
2383 $self->reflow; 2596 $self->reflow;
2384} 2597}
2385 2598
2599sub size_request {
2600 my ($self) = @_;
2601
2602 my ($empty, $slider) = @{ $self->{children} };
2603
2604 local $self->{children} = [$empty, $slider];
2605 $self->SUPER::size_request
2606}
2607
2386sub size_allocate { 2608sub invoke_size_allocate {
2387 my ($self, $w, $h, $changed) = @_; 2609 my ($self, $w, $h) = @_;
2388 2610
2389 $self->SUPER::size_allocate ($w, $h, $changed); 2611 my ($empty, $slider, @other) = @{ $self->{children} };
2390 2612 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2391 return unless $changed;
2392 2613
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2614 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2616 $self->{layout}->set_width ($empty->{w});
2617 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2618
2397 $self->reflow; 2619 $self->reflow;
2398}
2399 2620
2400sub text_size { 2621 local $self->{children} = [$empty, $slider];
2401 my ($self, $text, $indent) = @_; 2622 $self->SUPER::invoke_size_allocate ($w, $h)
2623}
2624
2625sub get_layout {
2626 my ($self, $para) = @_;
2402 2627
2403 my $layout = $self->{layout}; 2628 my $layout = $self->{layout};
2404 2629
2630 $layout->set_font ($self->{font}) if $self->{font};
2631 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2632 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2633 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2634 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2635 $layout->set_markup ($para->{markup});
2636
2637 $layout->set_shapes (
2638 map
2639 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2640 @{$para->{widget}}
2408 2641 );
2642
2409 $layout->size 2643 $layout
2410} 2644}
2411 2645
2412sub reflow { 2646sub reflow {
2413 my ($self) = @_; 2647 my ($self) = @_;
2414 2648
… …
2423 $self->{children}[1]->set_value ($offset); 2657 $self->{children}[1]->set_value ($offset);
2424} 2658}
2425 2659
2426sub clear { 2660sub clear {
2427 my ($self) = @_; 2661 my ($self) = @_;
2662
2663 my (undef, undef, @other) = @{ $self->{children} };
2664 $self->remove ($_) for @other;
2428 2665
2429 $self->{par} = []; 2666 $self->{par} = [];
2430 $self->{height} = 0; 2667 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2669}
2433 2670
2434sub add_paragraph { 2671sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2672 my ($self, $color, $para, $indent) = @_;
2436 2673
2437 for my $line (split /\n/, $text) { 2674 my ($text, @w) = ref $para ? @$para : $para;
2438 my ($w, $h) = $self->text_size ($line); 2675
2439 $self->{height} += $h; 2676 $para = {
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2677 w => 1e10,
2678 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2441 } 2683 };
2442 2684
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2685 $self->add (@w) if @w;
2686 push @{$self->{par}}, $para;
2687
2688 $self->{need_reflow}++;
2689 $self->update;
2690}
2691
2692sub scroll_to_bottom {
2693 my ($self) = @_;
2694
2695 $self->{scroll_to_bottom} = 1;
2696 $self->update;
2444} 2697}
2445 2698
2446sub update { 2699sub update {
2447 my ($self) = @_; 2700 my ($self) = @_;
2448 2701
… …
2450 2703
2451 return unless $self->{h} > 0; 2704 return unless $self->{h} > 0;
2452 2705
2453 delete $self->{texture}; 2706 delete $self->{texture};
2454 2707
2455 $ROOT->on_post_alloc ($self, sub { 2708 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2710
2458 if (delete $self->{need_reflow}) { 2711 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2712 my $height = 0;
2460 2713
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) { 2714 for my $para (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2467 $layout->set_width ($W - $_->[3]); 2716 my $layout = $self->get_layout ($para);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2717 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2718
2471 $_->[1] = $h; 2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2472 } 2722 }
2473 2723
2474 $height += $_->[1]; 2724 $height += $para->{h};
2475 } 2725 }
2476 2726
2477 $self->{height} = $height; 2727 $self->{height} = $height;
2478 2728
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2480 2730
2481 delete $self->{texture}; 2731 delete $self->{texture};
2482 } 2732 }
2483 2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2736 }
2737
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2739 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2740 glClear GL_COLOR_BUFFER_BIT;
2487 2741
2488 my $top = int $self->{children}[1]{range}[0]; 2742 my $top = int $self->{children}[1]{range}[0];
2489 2743
2490 my $y0 = $top; 2744 my $y0 = $top;
2491 my $y1 = $top + $H; 2745 my $y1 = $top + $H;
2492 2746
2493 my $y = 0; 2747 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498 2748
2499 glEnable GL_BLEND; 2749 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off 2750 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502 2752
2503 for my $par (@{$self->{par}}) { 2753 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 2754 my $h = $para->{h};
2505 2755
2506 if ($y0 < $y + $h && $y < $y1) { 2756 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 2757
2508 $layout->set_width ($W - $par->[3]); 2758 my $layout = $self->get_layout ($para);
2509 $layout->set_markup ($par->[4]);
2510 2759
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2512 2761
2513 glRasterPos $par->[3], $y - $y0; 2762 glRasterPos $para->{indent}, $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764
2765 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes;
2767
2768 glDisable GL_BLEND;
2769 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, ();
2771
2772 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0;
2774
2775 $_->draw;
2776 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 }
2515 } 2780 }
2516 2781
2517 $y += $h; 2782 $y += $h;
2518 } 2783 }
2519 2784
2520 glDisable GL_BLEND; 2785 glDisable GL_BLEND;
2521 }; 2786 };
2522 }); 2787 });
2523} 2788}
2524 2789
2790sub reconfigure {
2791 my ($self) = @_;
2792
2793 $self->SUPER::reconfigure;
2794
2795 $_->{w} = 1e10 for @{ $self->{par} };
2796 $self->reflow;
2797}
2798
2525sub _draw { 2799sub _draw {
2526 my ($self) = @_; 2800 my ($self) = @_;
2527 2801
2528 glEnable GL_TEXTURE_2D; 2802 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2804 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2805 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2533 2807
2534 $self->{children}[1]->draw; 2808 $self->{children}[1]->draw;
2535
2536} 2809}
2537 2810
2538############################################################################# 2811#############################################################################
2539 2812
2540package CFClient::UI::Animator; 2813package CFClient::UI::Animator;
… …
2619} 2892}
2620 2893
2621sub set_tooltip_from { 2894sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2895 my ($self, $widget) = @_;
2623 2896
2897 my $tooltip = $widget->{tooltip};
2898
2899 if ($ENV{CFPLUS_DEBUG} & 2) {
2900 $tooltip .= "\n\n" . (ref $widget) . "\n"
2901 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2902 . "req $widget->{req_w} $widget->{req_h}\n"
2903 . "visible $widget->{visible}";
2904 }
2905
2906 $tooltip =~ s/^\n+//;
2907 $tooltip =~ s/\n+$//;
2908
2624 $self->add (new CFClient::UI::Label 2909 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2910 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2911 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2912 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2913 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2914 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2915 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2638 2923
2639 ($w + 4, $h + 4) 2924 ($w + 4, $h + 4)
2640} 2925}
2641 2926
2642sub size_allocate { 2927sub invoke_size_allocate {
2643 my ($self, $w, $h, $changed) = @_; 2928 my ($self, $w, $h) = @_;
2644 2929
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2930 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2648} 2931}
2649 2932
2650sub visibility_change { 2933sub invoke_visibility_change {
2651 my ($self, $visible) = @_; 2934 my ($self, $visible) = @_;
2652 2935
2653 return unless $visible; 2936 return unless $visible;
2654 2937
2655 $self->{root}->on_post_alloc ("move_$self" => sub { 2938 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2657 or return; 2940 or return;
2658 2941
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660 2943
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH; 2945 if $x + $self->{w} > $self->{root}{w};
2663 2946
2664 $self->move_abs ($x, $y); 2947 $self->move_abs ($x, $y);
2665 }); 2948 });
2666} 2949}
2667 2950
… …
2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3039 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757 3040
2758 if ($tex) { 3041 if ($tex) {
2759 glEnable GL_TEXTURE_2D; 3042 glEnable GL_TEXTURE_2D;
2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761 glColor 1, 1, 1, 1; 3044 glColor 0, 0, 0, 1;
2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3045 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763 glDisable GL_TEXTURE_2D; 3046 glDisable GL_TEXTURE_2D;
2764 } 3047 }
2765} 3048}
2766 3049
2767sub DESTROY { 3050sub destroy {
2768 my ($self) = @_; 3051 my ($self) = @_;
2769 3052
2770 $self->{timer}->cancel 3053 $self->{timer}->cancel
2771 if $self->{timer}; 3054 if $self->{timer};
2772 3055
2773 $self->SUPER::DESTROY; 3056 $self->SUPER::destroy;
2774} 3057}
2775 3058
2776############################################################################# 3059#############################################################################
2777 3060
2778package CFClient::UI::Inventory; 3061package CFClient::UI::Buttonbar;
2779 3062
2780our @ISA = CFClient::UI::ScrolledWindow::; 3063our @ISA = CFClient::UI::HBox::;
2781 3064
2782sub new { 3065# TODO: should actualyl wrap buttons and other goodies.
2783 my $class = shift;
2784
2785 my $self = $class->SUPER::new (
2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787 @_,
2788 );
2789
2790 $self
2791}
2792
2793sub set_items {
2794 my ($self, $items) = @_;
2795
2796 $self->{scrolled}->clear;
2797 return unless $items;
2798
2799 my @items = sort {
2800 ($a->{type} <=> $b->{type})
2801 or ($a->{name} cmp $b->{name})
2802 } @$items;
2803
2804 $self->{real_items} = \@items;
2805
2806 my $row = 0;
2807 for my $item (@items) {
2808 CFClient::Item::update_widgets $item;
2809
2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814 $row++;
2815 }
2816}
2817 3066
2818############################################################################# 3067#############################################################################
2819 3068
2820package CFClient::UI::Menu; 3069package CFClient::UI::Menu;
2821 3070
… …
2833 ); 3082 );
2834 3083
2835 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3084 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2836 3085
2837 for my $item (@{ $self->{items} }) { 3086 for my $item (@{ $self->{items} }) {
2838 my ($widget, $cb) = @$item; 3087 my ($widget, $cb, $tooltip) = @$item;
2839 3088
2840 # handle various types of items, only text for now 3089 # handle various types of items, only text for now
2841 if (!ref $widget) { 3090 if (!ref $widget) {
2842 $widget = new CFClient::UI::Label 3091 $widget = new CFClient::UI::Label
2843 can_hover => 1, 3092 can_hover => 1,
2844 can_events => 1, 3093 can_events => 1,
2845 text => $widget; 3094 markup => $widget,
3095 tooltip => $tooltip
2846 } 3096 }
2847 3097
2848 $self->{item}{$widget} = $item; 3098 $self->{item}{$widget} = $item;
2849 3099
2850 $self->{vbox}->add ($widget); 3100 $self->{vbox}->add ($widget);
… …
2855 3105
2856# popup given the event (must be a mouse button down event currently) 3106# popup given the event (must be a mouse button down event currently)
2857sub popup { 3107sub popup {
2858 my ($self, $ev) = @_; 3108 my ($self, $ev) = @_;
2859 3109
2860 $self->_emit ("popdown"); 3110 $self->emit ("popdown");
2861 3111
2862 # maybe save $GRAB? must be careful about events... 3112 # maybe save $GRAB? must be careful about events...
2863 $GRAB = $self; 3113 $GRAB = $self;
2864 $self->{button} = $ev->{button}; 3114 $self->{button} = $ev->{button};
2865 3115
2866 $self->show; 3116 $self->show;
2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3117 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2868} 3118}
2869 3119
2870sub mouse_motion { 3120sub invoke_mouse_motion {
2871 my ($self, $ev, $x, $y) = @_; 3121 my ($self, $ev, $x, $y) = @_;
2872 3122
2873 # TODO: should use vbox->find_widget or so 3123 # TODO: should use vbox->find_widget or so
2874 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3124 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875 $self->{hover} = $self->{item}{$HOVER}; 3125 $self->{hover} = $self->{item}{$HOVER};
2876}
2877 3126
3127 0
3128}
3129
2878sub button_up { 3130sub invoke_button_up {
2879 my ($self, $ev, $x, $y) = @_; 3131 my ($self, $ev, $x, $y) = @_;
2880 3132
2881 if ($ev->{button} == $self->{button}) { 3133 if ($ev->{button} == $self->{button}) {
2882 undef $GRAB; 3134 undef $GRAB;
2883 $self->hide; 3135 $self->hide;
2884 3136
2885 $self->_emit ("popdown"); 3137 $self->emit ("popdown");
2886 $self->{hover}[1]->() if $self->{hover}; 3138 $self->{hover}[1]->() if $self->{hover};
3139 } else {
3140 return 0
3141 }
3142
2887 } 3143 1
2888} 3144}
2889 3145
2890############################################################################# 3146#############################################################################
2891 3147
2892package CFClient::UI::Statusbox; 3148package CFClient::UI::Multiplexer;
2893 3149
2894our @ISA = CFClient::UI::VBox::; 3150our @ISA = CFClient::UI::Container::;
2895 3151
2896sub new { 3152sub new {
2897 my $class = shift; 3153 my $class = shift;
2898 3154
2899 $class->SUPER::new ( 3155 my $self = $class->SUPER::new (
3156 @_,
3157 );
3158
3159 $self->{current} = $self->{children}[0]
3160 if @{ $self->{children} };
3161
3162 $self
3163}
3164
3165sub add {
3166 my ($self, @widgets) = @_;
3167
3168 $self->SUPER::add (@widgets);
3169
3170 $self->{current} = $self->{children}[0]
3171 if @{ $self->{children} };
3172}
3173
3174sub get_current_page {
3175 my ($self) = @_;
3176
3177 $self->{current}
3178}
3179
3180sub set_current_page {
3181 my ($self, $page_or_widget) = @_;
3182
3183 my $widget = ref $page_or_widget
3184 ? $page_or_widget
3185 : $self->{children}[$page_or_widget];
3186
3187 $self->{current} = $widget;
3188 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3189
3190 $self->emit (page_changed => $self->{current});
3191
3192 $self->realloc;
3193}
3194
3195sub visible_children {
3196 $_[0]{current}
3197}
3198
3199sub size_request {
3200 my ($self) = @_;
3201
3202 $self->{current}->size_request
3203}
3204
3205sub invoke_size_allocate {
3206 my ($self, $w, $h) = @_;
3207
3208 $self->{current}->configure (0, 0, $w, $h);
3209
3210 1
3211}
3212
3213sub _draw {
3214 my ($self) = @_;
3215
3216 $self->{current}->draw;
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::Notebook;
3222
3223our @ISA = CFClient::UI::VBox::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (
3229 buttonbar => (new CFClient::UI::Buttonbar),
3230 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3231 # filter => # will be put between multiplexer and $self
3232 @_,
3233 );
3234
3235 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3236 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3237
3238 $self
3239}
3240
3241sub add {
3242 my ($self, $title, $widget, $tooltip) = @_;
3243
3244 Scalar::Util::weaken $self;
3245
3246 $self->{buttonbar}->add (new CFClient::UI::Button
3247 markup => $title,
3248 tooltip => $tooltip,
3249 on_activate => sub { $self->set_current_page ($widget) },
3250 );
3251
3252 $self->{multiplexer}->add ($widget);
3253}
3254
3255sub get_current_page {
3256 my ($self) = @_;
3257
3258 $self->{multiplexer}->get_current_page
3259}
3260
3261sub set_current_page {
3262 my ($self, $page) = @_;
3263
3264 $self->{multiplexer}->set_current_page ($page);
3265 $self->emit (page_changed => $self->{multiplexer}{current});
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::Combobox;
3271
3272use utf8;
3273
3274our @ISA = CFClient::UI::Button::;
3275
3276sub new {
3277 my $class = shift;
3278
3279 my $self = $class->SUPER::new (
3280 options => [], # [value, title, longdesc], ...
3281 value => undef,
3282 @_,
3283 );
3284
3285 $self->_set_value ($self->{value});
3286
3287 $self
3288}
3289
3290sub invoke_button_down {
3291 my ($self, $ev) = @_;
3292
3293 my @menu_items;
3294
3295 for (@{ $self->{options} }) {
3296 my ($value, $title, $tooltip) = @$_;
3297
3298 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299 }
3300
3301 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302}
3303
3304sub _set_value {
3305 my ($self, $value) = @_;
3306
3307 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3308 or return;
3309
3310 $self->{value} = $item->[0];
3311 $self->set_markup ("$item->[1] ⇓");
3312 $self->set_tooltip ($item->[2]);
3313}
3314
3315sub set_value {
3316 my ($self, $value) = @_;
3317
3318 return unless $self->{value} ne $value;
3319
3320 $self->_set_value ($value);
3321 $self->emit (changed => $value);
3322}
3323
3324#############################################################################
3325
3326package CFClient::UI::Statusbox;
3327
3328our @ISA = CFClient::UI::VBox::;
3329
3330sub new {
3331 my $class = shift;
3332
3333 my $self = $class->SUPER::new (
2900 fontsize => 0.8, 3334 fontsize => 0.8,
2901 @_, 3335 @_,
2902 ) 3336 );
3337
3338 Scalar::Util::weaken (my $this = $self);
3339
3340 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3341
3342 $self
2903} 3343}
2904 3344
2905sub reorder { 3345sub reorder {
2906 my ($self) = @_; 3346 my ($self) = @_;
2907 my $NOW = time; 3347 my $NOW = Time::HiRes::time;
3348
3349 # freeze display when hovering over any label
3350 return if $CFClient::UI::TOOLTIP->{owner}
3351 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3352 values %{ $self->{item} };
2908 3353
2909 while (my ($k, $v) = each %{ $self->{item} }) { 3354 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3355 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 } 3356 }
2912 3357
… …
2915 my @items = sort { 3360 my @items = sort {
2916 $a->{pri} <=> $b->{pri} 3361 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id} 3362 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} }; 3363 } values %{ $self->{item} };
2919 3364
3365 $self->{timer}->interval (1);
3366
2920 my $count = 10 + 1; 3367 my $count = 10 + 1;
2921 for my $item (@items) { 3368 for my $item (@items) {
2922 last unless --$count; 3369 last unless --$count;
2923 3370
2924 push @widgets, $item->{label} ||= do { 3371 my $label = $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all) 3372 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1 3373 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}" 3374 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text}; 3375 : $item->{text};
2929 3376
… …
2937 tooltip => $item->{tooltip}, 3384 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP, 3385 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67, 3386 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize}, 3387 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44, 3388 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg}, 3389 fg => [@{ $item->{fg} }],
2943 can_events => 1, 3390 can_events => 1,
2944 can_hover => 1 3391 can_hover => 1
2945 }; 3392 };
3393
3394 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3395 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3396 $label->update;
3397 $label->set_max_size (undef, $label->{req_h} * $diff)
3398 if $diff < 1;
3399 $self->{timer}->interval (1/30);
3400 } else {
3401 $label->{fg}[3] = $item->{fg}[3] || 1;
3402 }
3403
3404 push @widgets, $label;
2946 } 3405 }
2947 3406
2948 $self->clear; 3407 $self->clear;
2949 $self->SUPER::add (reverse @widgets); 3408 $self->SUPER::add (reverse @widgets);
2950} 3409}
… …
2955 $text =~ s/^\s+//; 3414 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//; 3415 $text =~ s/\s+$//;
2957 3416
2958 return unless $text; 3417 return unless $text;
2959 3418
2960 my $timeout = time + ((delete $arg{timeout}) || 60); 3419 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961 3420
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3421 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963 3422
2964 if (my $item = $self->{item}{$group}) { 3423 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) { 3424 if ($item->{text} eq $text) {
2966 $item->{count}++; 3425 $item->{count}++;
2967 } else { 3426 } else {
2968 $item->{count} = 1; 3427 $item->{count} = 1;
2969 $item->{text} = $item->{tooltip} = $text; 3428 $item->{text} = $item->{tooltip} = $text;
2970 } 3429 }
2971 $item->{id} = ++$self->{id}; 3430 $item->{id} += 0.2;#d#
2972 $item->{timeout} = $timeout; 3431 $item->{timeout} = $timeout;
2973 delete $item->{label}; 3432 delete $item->{label};
2974 } else { 3433 } else {
2975 $self->{item}{$group} = { 3434 $self->{item}{$group} = {
2976 id => ++$self->{id}, 3435 id => ++$self->{id},
… …
2982 count => 1, 3441 count => 1,
2983 %arg, 3442 %arg,
2984 }; 3443 };
2985 } 3444 }
2986 3445
3446 $ROOT->on_refresh (reorder => sub {
2987 $self->reorder; 3447 $self->reorder;
3448 });
2988} 3449}
2989 3450
2990sub reconfigure { 3451sub reconfigure {
2991 my ($self) = @_; 3452 my ($self) = @_;
2992 3453
… …
2995 3456
2996 $self->reorder; 3457 $self->reorder;
2997 $self->SUPER::reconfigure; 3458 $self->SUPER::reconfigure;
2998} 3459}
2999 3460
3461sub destroy {
3462 my ($self) = @_;
3463
3464 $self->{timer}->cancel;
3465
3466 $self->SUPER::destroy;
3467}
3468
3000############################################################################# 3469#############################################################################
3001 3470
3471package CFClient::UI::Inventory;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 col_expand => [0, 1, 0],
3480 @_,
3481 );
3482
3483 $self
3484}
3485
3486sub set_items {
3487 my ($self, $items) = @_;
3488
3489 $self->clear;
3490 return unless $items;
3491
3492 my @items = sort {
3493 ($a->{type} <=> $b->{type})
3494 or ($a->{name} cmp $b->{name})
3495 } values %$items;
3496
3497 $self->{real_items} = \@items;
3498
3499 my $row = 0;
3500 for my $item (@items) {
3501 CFClient::Item::update_widgets $item;
3502
3503 $self->add (0, $row, $item->{face_widget});
3504 $self->add (1, $row, $item->{desc_widget});
3505 $self->add (2, $row, $item->{weight_widget});
3506
3507 $row++;
3508 }
3509}
3510
3511#############################################################################
3512
3513package CFClient::UI::SpellList;
3514
3515our @ISA = CFClient::UI::Table::;
3516
3517sub new {
3518 my $class = shift;
3519
3520 my $self = $class->SUPER::new (
3521 binding => [],
3522 commands => [],
3523 @_,
3524 )
3525}
3526
3527my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3528
3529my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3539
3540sub rebuild_spell_list {
3541 my ($self) = @_;
3542
3543 $CFClient::UI::ROOT->on_refresh ($self => sub {
3544 $self->clear;
3545
3546 return unless $::CONN;
3547
3548 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554 my $row = 0;
3555
3556 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557 my $spell = $self->{spell}{$_};
3558
3559 $row++;
3560
3561 my $spell_cb = sub {
3562 my ($widget, $ev) = @_;
3563
3564 if ($ev->{button} == 1) {
3565 $::CONN->user_send ("cast $spell->{name}");
3566 } elsif ($ev->{button} == 2) {
3567 $::CONN->user_send ("invoke $spell->{name}");
3568 } elsif ($ev->{button} == 3) {
3569 (new CFClient::UI::Menu
3570 items => [
3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573 ],
3574 )->popup ($ev);
3575 } else {
3576 return 0;
3577 }
3578
3579 1
3580 };
3581
3582 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584 #TODO: add path info to tooltip
3585 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587 $self->add (0, $row, new CFClient::UI::Face
3588 face => $spell->{face},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (1, $row, new CFClient::UI::Label
3596 expand => 1,
3597 text => $spell->{name},
3598 can_hover => 1,
3599 can_events => 1,
3600 tooltip => $tooltip,
3601 on_button_down => $spell_cb,
3602 );
3603
3604 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608 }
3609 });
3610}
3611
3612sub add_spell {
3613 my ($self, $spell) = @_;
3614
3615 $self->{spell}->{$spell->{name}} = $spell;
3616 $self->rebuild_spell_list;
3617}
3618
3619sub remove_spell {
3620 my ($self, $spell) = @_;
3621
3622 delete $self->{spell}->{$spell->{name}};
3623 $self->rebuild_spell_list;
3624}
3625
3626sub clear_spells {
3627 my ($self) = @_;
3628
3629 $self->{spell} = {};
3630 $self->rebuild_spell_list;
3631}
3632
3633#############################################################################
3634
3002package CFClient::UI::Root; 3635package CFClient::UI::Root;
3003 3636
3004our @ISA = CFClient::UI::Container::; 3637our @ISA = CFClient::UI::Container::;
3638
3639use List::Util qw(min max);
3005 3640
3006use CFClient::OpenGL; 3641use CFClient::OpenGL;
3007 3642
3008sub new { 3643sub new {
3009 my $class = shift; 3644 my $class = shift;
… …
3016 Scalar::Util::weaken ($self->{root} = $self); 3651 Scalar::Util::weaken ($self->{root} = $self);
3017 3652
3018 $self 3653 $self
3019} 3654}
3020 3655
3021sub configure {
3022 my ($self, $x, $y, $w, $h) = @_;
3023
3024 $self->{w} = $w;
3025 $self->{h} = $h;
3026}
3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 $self->SUPER::reconfigure;
3032
3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3034 if $self->{w};
3035}
3036
3037sub size_request { 3656sub size_request {
3038 my ($self) = @_; 3657 my ($self) = @_;
3039 3658
3040 ($self->{w}, $self->{h}) 3659 ($self->{w}, $self->{h})
3041} 3660}
… …
3052 $coord = $max - $size if $coord > $max - $size; 3671 $coord = $max - $size if $coord > $max - $size;
3053 3672
3054 int $coord + 0.5 3673 int $coord + 0.5
3055} 3674}
3056 3675
3057sub size_allocate { 3676sub invoke_size_allocate {
3058 my ($self, $w, $h, $changed) = @_; 3677 my ($self, $w, $h) = @_;
3059 3678
3060 for my $child ($self->children) { 3679 for my $child ($self->children) {
3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3680 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062 3681
3063 $X = $child->{force_x} if exists $child->{force_x}; 3682 $X = $child->{force_x} if exists $child->{force_x};
… …
3066 $X = _to_pixel $X, $W, $self->{w}; 3685 $X = _to_pixel $X, $W, $self->{w};
3067 $Y = _to_pixel $Y, $H, $self->{h}; 3686 $Y = _to_pixel $Y, $H, $self->{h};
3068 3687
3069 $child->configure ($X, $Y, $W, $H); 3688 $child->configure ($X, $Y, $W, $H);
3070 } 3689 }
3690
3691 1
3071} 3692}
3072 3693
3073sub coord2local { 3694sub coord2local {
3074 my ($self, $x, $y) = @_; 3695 my ($self, $x, $y) = @_;
3075 3696
… …
3131 $_->() 3752 $_->()
3132 for values %{delete $self->{refresh_hook}}; 3753 for values %{delete $self->{refresh_hook}};
3133 } 3754 }
3134 3755
3135 if ($self->{realloc}) { 3756 if ($self->{realloc}) {
3757 my %queue;
3136 my @queue; 3758 my @queue;
3759 my $widget;
3137 3760
3761 outer:
3138 while () { 3762 while () {
3139 if ($self->{realloc}) { 3763 if (my $realloc = delete $self->{realloc}) {
3140 #TODO use array-of-depth approach 3764 for $widget (values %$realloc) {
3765 $widget->{visible} or next; # do not resize invisible widgets
3141 3766
3142 @queue = sort { $a->{visible} <=> $b->{visible} } 3767 $queue{$widget+0}++ and next; # duplicates are common
3143 @queue, values %{delete $self->{realloc}}; 3768
3769 push @{ $queue[$widget->{visible}] }, $widget;
3770 }
3144 } 3771 }
3145 3772
3773 while () {
3774 @queue or last outer;
3775
3146 my $widget = pop @queue || last; 3776 $widget = pop @{ $queue[-1] || [] }
3777 and last;
3778
3779 pop @queue;
3780 }
3147 3781
3148 $widget->{visible} or last; # do not resize invisible widgets 3782 delete $queue{$widget+0};
3149 3783
3150 my ($w, $h) = $widget->size_request; 3784 my ($w, $h) = $widget->size_request;
3151 3785
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3786 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3787 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3788
3789 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3790 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154 3791
3155 $w = $widget->{force_w} if exists $widget->{force_w}; 3792 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h}; 3793 $h = $widget->{force_h} if exists $widget->{force_h};
3157 3794
3795 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3796 || delete $widget->{force_realloc}) {
3158 $widget->{req_w} = $w; 3797 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h; 3798 $widget->{req_h} = $h;
3160 3799
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3800 $self->{size_alloc}{$widget+0} = $widget;
3162 3801
3163 push @queue, $widget->{parent} 3802 if (my $parent = $widget->{parent}) {
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3803 $self->{realloc}{$parent+0} = $parent
3804 unless $queue{$parent+0};
3805
3806 $parent->{force_size_alloc} = 1;
3807 $self->{size_alloc}{$parent+0} = $parent;
3808 }
3809 }
3810
3811 delete $self->{realloc}{$widget+0};
3165 } 3812 }
3166 } 3813 }
3167 3814
3168 while (my $size_alloc = delete $self->{size_alloc}) { 3815 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3816 my @queue = sort { $b->{visible} <=> $a->{visible} }
3170 values %$size_alloc; 3817 values %$size_alloc;
3171 3818
3172 while () { 3819 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last }; 3820 my $widget = pop @queue || last;
3174 3821
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3822 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177 3823
3178 $w = 0 if $w < 0; 3824 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0; 3825 $h = 0 if $h < 0;
3180 3826
3181 $w = int $w + 0.5; 3827 $w = int $w + 0.5;
3182 $h = int $h + 0.5; 3828 $h = int $h + 0.5;
3183 3829
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831 $widget->{old_w} = $widget->{w};
3832 $widget->{old_h} = $widget->{h};
3185 3833
3186 $widget->{w} = $w; 3834 $widget->{w} = $w;
3187 $widget->{h} = $h; 3835 $widget->{h} = $h;
3188 3836
3189 $widget->emit (size_allocate => $w, $h, $changed); 3837 $widget->emit (size_allocate => $w, $h);
3838 }
3190 } 3839 }
3191 } 3840 }
3192 3841
3193 while ($self->{post_alloc_hook}) { 3842 while ($self->{post_alloc_hook}) {
3194 $_->() 3843 $_->()
3195 for values %{delete $self->{post_alloc_hook}}; 3844 for values %{delete $self->{post_alloc_hook}};
3196 } 3845 }
3846
3197 3847
3198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3848 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3849 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200 glClear GL_COLOR_BUFFER_BIT; 3850 glClear GL_COLOR_BUFFER_BIT;
3201 3851
… …
3203 glLoadIdentity; 3853 glLoadIdentity;
3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3854 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205 glMatrixMode GL_MODELVIEW; 3855 glMatrixMode GL_MODELVIEW;
3206 glLoadIdentity; 3856 glLoadIdentity;
3207 3857
3858 {
3859 package CFClient::UI::Base;
3860
3861 ($draw_x, $draw_y, $draw_w, $draw_h) =
3862 (0, 0, $self->{w}, $self->{h});
3863 }
3864
3208 $self->_draw; 3865 $self->_draw;
3209} 3866}
3210 3867
3211############################################################################# 3868#############################################################################
3212 3869

Diff Legend

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