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.310 by root, Fri Jun 23 20:28:20 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
… …
355 $self->{x} = $x; 356 $self->{x} = $x;
356 $self->{y} = $y; 357 $self->{y} = $y;
357 $self->update; 358 $self->update;
358 } 359 }
359 360
360 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible}; 362 return unless $self->{visible};
362 363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 367 $self->{root}{size_alloc}{$self+0} = $self;
364 } 368 }
365}
366
367sub size_allocate {
368 # nothing to be done
369} 369}
370 370
371sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
372} 377}
373 378
374sub set_max_size { 379sub set_max_size {
375 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
376 381
377 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
378 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
379} 386}
380 387
381sub set_tooltip { 388sub set_tooltip {
382 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
383 390
… …
388 395
389 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
390 397
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
394 } 401 }
395} 402}
396 403
397# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
398sub coord2local { 405sub coord2local {
… …
406 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
407 414
408 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
409} 416}
410 417
411sub focus_in { 418sub invoke_focus_in {
412 my ($self) = @_; 419 my ($self) = @_;
413 420
414 return if $FOCUS == $self; 421 return if $FOCUS == $self;
415 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
416 423
417 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
418 425
419 $self->_emit (focus_in => $focus);
420
421 $focus->update if $focus; 426 $focus->update if $focus;
422 $FOCUS->update; 427 $FOCUS->update;
423}
424 428
429 0
430}
431
425sub focus_out { 432sub invoke_focus_out {
426 my ($self) = @_; 433 my ($self) = @_;
427 434
428 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
429 436
430 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
431 438
432 $self->_emit (focus_out => $focus);
433
434 $focus->update if $focus; #? 439 $focus->update if $focus; #?
435 440
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
437 unless $FOCUS; 442 unless $FOCUS;
438}
439 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
440sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
441sub button_up { } 454sub invoke_button_up { 1 }
442sub key_down { } 455sub invoke_key_down { 1 }
443sub key_up { } 456sub invoke_key_up { 1 }
444 457
445sub button_down { 458sub invoke_button_down {
446 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
447 460
448 $self->focus_in; 461 $self->grab_focus;
449}
450 462
451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479}
456 480
457sub find_widget { 481sub find_widget {
458 my ($self, $x, $y) = @_; 482 my ($self, $x, $y) = @_;
459 483
460 return () unless $self->{can_events}; 484 return () unless $self->{can_events};
… …
471 495
472 Scalar::Util::weaken ($self->{parent} = $parent); 496 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible}; 497 $self->set_visible if $parent->{visible};
474} 498}
475 499
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 { 500sub realloc {
500 my ($self) = @_; 501 my ($self) = @_;
501 502
502 if ($self->{visible}) { 503 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self}; 504 return if $self->{root}{realloc}{$self+0};
504 505
505 $self->{root}{realloc}{$self} = $self; 506 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update; 507 $self->{root}->update;
507 } else { 508 } else {
508 delete $self->{req_w}; 509 delete $self->{req_w};
510 delete $self->{req_h};
509 } 511 }
510} 512}
511 513
512sub update { 514sub update {
513 my ($self) = @_; 515 my ($self) = @_;
… …
521 523
522 $self->realloc; 524 $self->realloc;
523 $self->update; 525 $self->update;
524} 526}
525 527
528# using global variables seems a bit hacky, but passing through all drawing
529# functions seems pointless.
530our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
531
526sub draw { 532sub draw {
527 my ($self) = @_; 533 my ($self) = @_;
528 534
529 return unless $self->{h} && $self->{w}; 535 return unless $self->{h} && $self->{w};
536
537 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542
543 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
530 546
531 glPushMatrix; 547 glPushMatrix;
532 glTranslate $self->{x}, $self->{y}, 0; 548 glTranslate $self->{x}, $self->{y}, 0;
533 $self->_draw;
534 glPopMatrix;
535 549
536 if ($self == $HOVER && $self->{can_hover}) { 550 if ($self == $HOVER && $self->{can_hover}) {
537 my ($x, $y) = @$self{qw(x y)};
538
539 glColor 1, 0.8, 0.5, 0.2; 551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
540 glEnable GL_BLEND; 552 glEnable GL_BLEND;
541 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542 glBegin GL_QUADS; 554 glBegin GL_QUADS;
543 glVertex $x , $y; 555 glVertex 0 , 0;
544 glVertex $x + $self->{w}, $y; 556 glVertex $self->{w}, 0;
545 glVertex $x + $self->{w}, $y + $self->{h}; 557 glVertex $self->{w}, $self->{h};
546 glVertex $x , $y + $self->{h}; 558 glVertex 0 , $self->{h};
547 glEnd; 559 glEnd;
548 glDisable GL_BLEND; 560 glDisable GL_BLEND;
549 } 561 }
550 562
551 if ($ENV{CFPLUS_DEBUG}) { 563 if ($ENV{CFPLUS_DEBUG} & 1) {
552 glPushMatrix; 564 glPushMatrix;
553 glColor 1, 1, 0, 1; 565 glColor 1, 1, 0, 1;
554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 566 glTranslate 0.375, 0.375;
555 glBegin GL_LINE_LOOP; 567 glBegin GL_LINE_LOOP;
556 glVertex 0 , 0; 568 glVertex 0 , 0;
557 glVertex $self->{w} - 1, 0; 569 glVertex $self->{w} - 1, 0;
558 glVertex $self->{w} - 1, $self->{h} - 1; 570 glVertex $self->{w} - 1, $self->{h} - 1;
559 glVertex 0 , $self->{h} - 1; 571 glVertex 0 , $self->{h} - 1;
560 glEnd; 572 glEnd;
561 glPopMatrix; 573 glPopMatrix;
562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
563 } 575 }
576
577 $self->_draw;
578 glPopMatrix;
564} 579}
565 580
566sub _draw { 581sub _draw {
567 my ($self) = @_; 582 my ($self) = @_;
568 583
… …
571 586
572sub DESTROY { 587sub DESTROY {
573 my ($self) = @_; 588 my ($self) = @_;
574 589
575 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
576 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
577} 594}
578 595
579############################################################################# 596#############################################################################
580 597
581package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
606 623
607 if ($color && (@$color < 4 || $color->[3])) { 624 if ($color && (@$color < 4 || $color->[3])) {
608 my ($w, $h) = @$self{qw(w h)}; 625 my ($w, $h) = @$self{qw(w h)};
609 626
610 glEnable GL_BLEND; 627 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glColor @$color; 629 glColor_premultiply @$color;
613 630
614 glBegin GL_QUADS; 631 glBegin GL_QUADS;
615 glVertex 0 , 0; 632 glVertex 0 , 0;
616 glVertex 0 , $h; 633 glVertex 0 , $h;
617 glVertex $w, $h; 634 glVertex $w, $h;
… …
648our @ISA = CFClient::UI::Base::; 665our @ISA = CFClient::UI::Base::;
649 666
650sub new { 667sub new {
651 my ($class, %arg) = @_; 668 my ($class, %arg) = @_;
652 669
653 my $children = delete $arg{children} || []; 670 my $children = delete $arg{children};
654 671
655 my $self = $class->SUPER::new ( 672 my $self = $class->SUPER::new (
656 children => [], 673 children => [],
657 can_events => 0, 674 can_events => 0,
658 %arg, 675 %arg,
659 ); 676 );
677
660 $self->add ($_) for @$children; 678 $self->add (@$children)
679 if $children;
661 680
662 $self 681 $self
663} 682}
664 683
665sub add { 684sub add {
… …
713 $x -= $self->{x}; 732 $x -= $self->{x};
714 $y -= $self->{y}; 733 $y -= $self->{y};
715 734
716 my $res; 735 my $res;
717 736
718 for (reverse @{ $self->{children} }) { 737 for (reverse $self->visible_children) {
719 $res = $_->find_widget ($x, $y) 738 $res = $_->find_widget ($x, $y)
720 and return $res; 739 and return $res;
721 } 740 }
722 741
723 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 742 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
744} 763}
745 764
746sub add { 765sub add {
747 my ($self, $child) = @_; 766 my ($self, $child) = @_;
748 767
749 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
750
751 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
752} 770}
753 771
754sub remove { 772sub remove {
755 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
764 782
765sub size_request { 783sub size_request {
766 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
767} 785}
768 786
769sub size_allocate { 787sub invoke_size_allocate {
770 my ($self, $w, $h, $changed) = @_; 788 my ($self, $w, $h) = @_;
771 789
772 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
773} 793}
774 794
775############################################################################# 795#############################################################################
796
797# back-buffered drawing area
776 798
777package CFClient::UI::Window; 799package CFClient::UI::Window;
778 800
779our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
780 802
… …
791 813
792 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
793 $self->SUPER::update; 815 $self->SUPER::update;
794} 816}
795 817
796sub size_allocate { 818sub invoke_size_allocate {
797 my ($self, $w, $h, $changed) = @_; 819 my ($self, $w, $h) = @_;
798 820
799 $self->SUPER::size_allocate ($w, $h, $changed);
800 $self->update 821 $self->update;
801 if $changed; 822
823 $self->SUPER::invoke_size_allocate ($w, $h)
802} 824}
803 825
804sub _render { 826sub _render {
827 my ($self) = @_;
828
805 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
806} 830}
807 831
808sub render_child { 832sub render_child {
809 my ($self) = @_; 833 my ($self) = @_;
810 834
811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
812 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
813 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
814 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
815 $self->_render; 846 $self->_render;
816 }; 847 };
817} 848}
818 849
819sub _draw { 850sub _draw {
820 my ($self) = @_; 851 my ($self) = @_;
821 852
822 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
823 854
824 my $tex = $self->{texture} 855 my $tex = $self->{texture}
825 or return; 856 or return;
826 857
827 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
830 861
831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
832 863
833 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
834} 865}
… …
850} 881}
851 882
852sub size_request { 883sub size_request {
853 my ($self) = @_; 884 my ($self) = @_;
854 885
855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856 887
857 $w = 10 if $self->{scroll_x}; 888 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
859 890
860 ($w, $h) 891 ($w, $h)
861} 892}
862 893
863sub size_allocate { 894sub invoke_size_allocate {
864 my ($self, $w, $h, $changed) = @_; 895 my ($self, $w, $h) = @_;
865 896
897 my $child = $self->child;
898
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868 901
869 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
870 $self->update; 903 $self->update;
904
905 1
871} 906}
872 907
873sub set_offset { 908sub set_offset {
874 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
875 910
… …
908} 943}
909 944
910sub _render { 945sub _render {
911 my ($self) = @_; 946 my ($self) = @_;
912 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
913 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914 952
915 $self->SUPER::_render; 953 $self->SUPER::_render;
916} 954}
917 955
… …
920package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
921 959
922our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
923 961
924sub new { 962sub new {
925 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
926 966
927 my $self; 967 my $self;
928 968
929 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
930 vertical => 1, 970 vertical => 1,
… …
935 ; 975 ;
936 976
937 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
938 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
939 slider => $slider, 979 slider => $slider,
940 @_, 980 %arg,
941 ); 981 );
942 982
943 $self->{vp}->add ($self->{scrolled});
944 $self->add ($self->{vp});
945 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
946 985
947 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
948} 993}
949 994
950sub update { 995sub update {
951 my ($self) = @_; 996 my ($self) = @_;
952 997
… …
955 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
956 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1003}
959 1004
960sub size_allocate { 1005sub invoke_size_allocate {
961 my ($self, $w, $h, $changed) = @_; 1006 my ($self, $w, $h) = @_;
962
963 $self->SUPER::size_allocate ($w, $h, $changed);
964 1007
965 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
967} 1012}
968 1013
969#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
970# update viewport offset on scroll 1015# update viewport offset on scroll
971 1016
… …
991 1036
992 if ($self->{bg}) { 1037 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
994 1039
995 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
998 1043
999 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
1000 glVertex 0 , 0; 1045 glVertex 0 , 0;
1001 glVertex 0 , $h; 1046 glVertex 0 , $h;
1002 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1024my @border = 1069my @border =
1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 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); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027 1072
1028sub new { 1073sub new {
1029 my $class = shift; 1074 my ($class, %arg) = @_;
1030 1075
1031 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1032 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1033 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1034 border => 0.6, 1079 border => 0.6,
1035 can_events => 1, 1080 can_events => 1,
1036 min_w => 16, 1081 min_w => 16,
1037 min_h => 16, 1082 min_h => 16,
1038 @_ 1083 %arg,
1039 ); 1084 );
1040 1085
1041 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
1042 align => 0, 1087 align => 0,
1043 valign => 1, 1088 valign => 1,
1044 text => $self->{title}, 1089 text => $self->{title},
1045 fontsize => $self->{border}; 1090 fontsize => $self->{border},
1091 if exists $self->{title};
1092
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 path => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1046 1101
1047 $self 1102 $self
1103}
1104
1105sub add {
1106 my ($self, @widgets) = @_;
1107
1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1048} 1111}
1049 1112
1050sub border { 1113sub border {
1051 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
1052} 1115}
1053 1116
1054sub size_request { 1117sub size_request {
1055 my ($self) = @_; 1118 my ($self) = @_;
1119
1120 $self->{title_widget}->size_request
1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1056 1125
1057 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1058 1127
1059 ( 1128 (
1060 $w + $self->border * 2, 1129 $w + $self->border * 2,
1061 $h + $self->border * 2, 1130 $h + $self->border * 2,
1062 ) 1131 )
1063} 1132}
1064 1133
1065sub size_allocate { 1134sub invoke_size_allocate {
1066 my ($self, $w, $h, $changed) = @_; 1135 my ($self, $w, $h) = @_;
1067 1136
1068 return unless $changed; 1137 if ($self->{title_widget}) {
1138 $self->{title_widget}{w} = $w;
1139 $self->{title_widget}{h} = $h;
1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1141 }
1069 1142
1143 my $border = $self->border;
1144
1070 $h -= List::Util::max 0, $self->border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1071 $w -= List::Util::max 0, $self->border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1072 1147
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); 1148 $self->child->configure ($border, $border, $w, $h);
1077}
1078 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1079sub button_down { 1156sub invoke_button_down {
1080 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1081 1158
1082 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1083 my $border = $self->border; 1160 my $border = $self->border;
1084 1161
… …
1100 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1101 1178
1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104 1181
1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105 $self->realloc; 1183 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107 }; 1184 };
1108 1185
1109 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1110 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1114 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1115 1192
1116 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1117 1194
1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1120 } 1203 1
1121} 1204}
1122 1205
1123sub button_up { 1206sub invoke_button_up {
1124 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1125 1208
1126 delete $self->{motion}; 1209 ! ! delete $self->{motion}
1127} 1210}
1128 1211
1129sub mouse_motion { 1212sub invoke_mouse_motion {
1130 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1131 1214
1132 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216
1217 ! ! $self->{motion}
1133} 1218}
1134 1219
1135sub _draw { 1220sub _draw {
1136 my ($self) = @_; 1221 my ($self) = @_;
1137 1222
1223 my $child = $self->{children}[0];
1224
1138 my ($w, $h ) = ($self->{w}, $self->{h}); 1225 my ($w, $h ) = ($self->{w}, $self->{h});
1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1226 my ($cw, $ch) = ($child->{w}, $child->{h});
1140 1227
1141 glEnable GL_TEXTURE_2D; 1228 glEnable GL_TEXTURE_2D;
1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143 1230
1144 my $border = $self->border; 1231 my $border = $self->border;
… …
1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1246 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 } 1247 }
1161 1248
1162 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1163 1250
1164 $self->{title}->draw if $self->{title};
1165
1166 $self->child->draw; 1251 $child->draw;
1252
1253 if ($self->{title_widget}) {
1254 glTranslate 0, $border - $self->{h};
1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1167} 1262}
1168 1263
1169############################################################################# 1264#############################################################################
1170 1265
1171package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1194 1289
1195 $child->set_parent ($self); 1290 $child->set_parent ($self);
1196 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1197 1292
1198 $self->realloc; 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1199} 1300}
1200 1301
1201# TODO: move to container class maybe? send children a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1202sub clear { 1303sub clear {
1203 my ($self) = @_; 1304 my ($self) = @_;
… …
1244 (sum @$ws), 1345 (sum @$ws),
1245 (sum @$hs), 1346 (sum @$hs),
1246 ) 1347 )
1247} 1348}
1248 1349
1249sub size_allocate { 1350sub invoke_size_allocate {
1250 my ($self, $w, $h, $changed) = @_; 1351 my ($self, $w, $h) = @_;
1251 1352
1252 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1253 1354
1254 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
1255 my $req_h = (sum @$hs) || 1; 1356 my $req_h = (sum @$hs) || 1;
… …
1286 } 1387 }
1287 1388
1288 $y += $row_h; 1389 $y += $row_h;
1289 } 1390 }
1290 1391
1392 1
1291} 1393}
1292 1394
1293sub find_widget { 1395sub find_widget {
1294 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1295 1397
… …
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 ) 1436 )
1335} 1437}
1336 1438
1337sub size_allocate { 1439sub invoke_size_allocate {
1338 my ($self, $w, $h, $changed) = @_; 1440 my ($self, $w, $h) = @_;
1339 1441
1340 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children}; 1443 my @children = $self->visible_children;
1342 1444
1343 my @req; 1445 my @req;
1344 1446
1345 if ($self->{homogeneous}) { 1447 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children; 1448 @req = ($space / (@children || 1)) x @children;
1347 } else { 1449 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1349 my $req = List::Util::sum @req; 1451 my $req = List::Util::sum @req;
1350 1452
1351 if ($req > $space) { 1453 if ($req > $space) {
1352 # ah well, not enough space 1454 # ah well, not enough space
1353 $_ *= $space / $req for @req; 1455 $_ *= $space / $req for @req;
1354 } else { 1456 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1457 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1356 1458
1357 $space = ($space - $req) / $expand; # remaining space to give away 1459 $space = ($space - $req) / $expand; # remaining space to give away
1358 1460
1359 $req[$_] += $space * $children->[$_]{expand} 1461 $req[$_] += $space * $children[$_]{expand}
1360 for 0 .. $#$children; 1462 for 0 .. $#children;
1361 } 1463 }
1362 } 1464 }
1363 1465
1364 CFClient::UI::harmonize \@req; 1466 CFClient::UI::harmonize \@req;
1365 1467
1366 my $pos = 0; 1468 my $pos = 0;
1367 for (0 .. $#$children) { 1469 for (0 .. $#children) {
1368 my $alloc = $req[$_]; 1470 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1471 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370 1472
1371 $pos += $alloc; 1473 $pos += $alloc;
1372 } 1474 }
1373 1475
1374 1 1476 1
… …
1464 1566
1465 delete $self->{texture}; 1567 delete $self->{texture};
1466 $self->SUPER::update; 1568 $self->SUPER::update;
1467} 1569}
1468 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1469sub set_text { 1578sub set_text {
1470 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1471 1580
1472 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1473 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1474 1583
1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1476 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1477 1586
1587 delete $self->{size_req};
1478 $self->realloc; 1588 $self->realloc;
1479 $self->update; 1589 $self->update;
1480} 1590}
1481 1591
1482sub set_markup { 1592sub set_markup {
… …
1488 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489 1599
1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1491 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1492 1602
1603 delete $self->{size_req};
1493 $self->realloc; 1604 $self->realloc;
1494 $self->update; 1605 $self->update;
1495} 1606}
1496 1607
1497sub size_request { 1608sub size_request {
1498 my ($self) = @_; 1609 my ($self) = @_;
1499 1610
1611 $self->{size_req} ||= do {
1500 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1501 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1617
1506 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1507 1619
1508 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1509 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1510 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1623
1512 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1513 1625
1514 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1515 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1516 } 1631 };
1517 1632
1518 ($w, $h) 1633 @{ $self->{size_req} }
1519} 1634}
1520 1635
1521sub size_allocate { 1636sub invoke_size_allocate {
1522 my ($self, $w, $h, $changed) = @_; 1637 my ($self, $w, $h) = @_;
1638
1639 delete $self->{ox};
1523 1640
1524 delete $self->{texture} 1641 delete $self->{texture}
1525 if $changed; 1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1526} 1645}
1527 1646
1528sub set_fontsize { 1647sub set_fontsize {
1529 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1530 1649
1531 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1532 delete $self->{texture}; 1651 delete $self->{texture};
1533 1652
1534 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1535} 1662}
1536 1663
1537sub _draw { 1664sub _draw {
1538 my ($self) = @_; 1665 my ($self) = @_;
1539 1666
… …
1545 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549 1676
1550 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1551 1679
1680 unless (exists $self->{ox}) {
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1555 1684
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1559
1560 $tex
1561 }; 1688 };
1562 1689
1563 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1565 1694
1566 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1567 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1569 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1571 } 1702 }
1572 1703
1573 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1574} 1705}
1575 1706
… …
1592 can_hover => 1, 1723 can_hover => 1,
1593 can_focus => 1, 1724 can_focus => 1,
1594 valign => 0, 1725 valign => 0,
1595 can_events => 1, 1726 can_events => 1,
1596 #text => ... 1727 #text => ...
1728 #hidden => "*",
1597 @_ 1729 @_
1598 ) 1730 )
1599} 1731}
1600 1732
1601sub _set_text { 1733sub _set_text {
… …
1603 1735
1604 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1605 1737
1606 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1607 1739
1608 delete $self->{texture};
1609
1610 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1611 $self->{text} = $text; 1741 $self->{text} = $text;
1612 1742
1613 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1614 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1615 1746
1616 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1617} 1751}
1618 1752
1619sub set_text { 1753sub set_text {
1620 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1621 1755
1622 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1623 $self->_set_text ($text); 1757 $self->_set_text ($text);
1624
1625 $self->realloc;
1626} 1758}
1627 1759
1628sub get_text { 1760sub get_text {
1629 $_[0]{text} 1761 $_[0]{text}
1630} 1762}
… …
1635 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1636 1768
1637 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1638} 1770}
1639 1771
1640sub key_down { 1772sub invoke_key_down {
1641 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1642 1774
1643 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1644 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1645 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1657 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1658 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1659 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1660 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1661 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1662 $self->_emit ('escape'); 1794 $self->emit ('escape');
1663 } elsif ($uni) { 1795 } elsif ($uni) {
1664 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1665 } 1799 }
1666 1800
1667 $self->_set_text ($text); 1801 $self->_set_text ($text);
1668 1802
1669 $self->realloc; 1803 $self->realloc;
1670}
1671 1804
1805 1
1806}
1807
1672sub focus_in { 1808sub invoke_focus_in {
1673 my ($self) = @_; 1809 my ($self) = @_;
1674 1810
1675 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1676 1812
1677 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1678} 1814}
1679 1815
1680sub button_down { 1816sub invoke_button_down {
1681 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1682 1818
1683 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1684 1820
1685 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1686 1822
1687 # byte-index to char-index 1823 # byte-index to char-index
1688 my $text = $self->{text}; 1824 my $text = $self->{text};
1689 utf8::encode $text; 1825 utf8::encode $text;
1690 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1691 1827
1692 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1693 $self->update; 1829 $self->update;
1830
1831 1
1694} 1832}
1695 1833
1696sub mouse_motion { 1834sub invoke_mouse_motion {
1697 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1698# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 1
1699} 1839}
1700 1840
1701sub _draw { 1841sub _draw {
1702 my ($self) = @_; 1842 my ($self) = @_;
1703 1843
1704 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1705 1845
1706 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1707 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1708 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1709 } else { 1849 } else {
1710 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1711 } 1851 }
1712 1852
1713 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1716 glVertex 0 , 0; 1856 glVertex 0 , 0;
1717 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1718 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1719 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1744 1884
1745our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1746 1886
1747use CFClient::OpenGL; 1887use CFClient::OpenGL;
1748 1888
1749sub key_down { 1889sub invoke_key_down {
1750 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1751 1891
1752 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1753 1893
1754 if ($sym == 13) { 1894 if ($sym == 13) {
1755 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1756 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1757 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1758 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1759 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1760 $self->update; 1901 $self->update;
1761 1902
1762 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1763 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1764 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1780 } else { 1921 } else {
1781 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1782 } 1923 }
1783 1924
1784 } else { 1925 } else {
1785 $self->SUPER::key_down ($ev); 1926 return $self->SUPER::invoke_key_down ($ev)
1927 }
1928
1786 } 1929 1
1787
1788} 1930}
1789 1931
1790############################################################################# 1932#############################################################################
1791 1933
1792package CFClient::UI::Button; 1934package CFClient::UI::Button;
… …
1813 can_events => 1, 1955 can_events => 1,
1814 @_ 1956 @_
1815 ) 1957 )
1816} 1958}
1817 1959
1818sub activate { }
1819
1820sub button_up { 1960sub invoke_button_up {
1821 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1822 1962
1823 $self->emit ("activate") 1963 $self->emit ("activate")
1824 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1825 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
1966
1967 1
1826} 1968}
1827 1969
1828sub _draw { 1970sub _draw {
1829 my ($self) = @_; 1971 my ($self) = @_;
1830 1972
1831 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833 if ($GRAB == $self) {
1834 $self->{fg} = $self->{active_fg};
1835 }
1836 1974
1837 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1840 1978
1841 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1842 1980
1843 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1844 1982
1845 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1984}
1985
1986#############################################################################
1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
1846} 2020}
1847 2021
1848############################################################################# 2022#############################################################################
1849 2023
1850package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
… …
1877 my ($self) = @_; 2051 my ($self) = @_;
1878 2052
1879 (6) x 2 2053 (6) x 2
1880} 2054}
1881 2055
1882sub button_down { 2056sub invoke_button_down {
1883 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1884 2058
1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1888 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
1889 } 2067 1
1890} 2068}
1891 2069
1892sub _draw { 2070sub _draw {
1893 my ($self) = @_; 2071 my ($self) = @_;
1894 2072
… …
1914package CFClient::UI::Image; 2092package CFClient::UI::Image;
1915 2093
1916our @ISA = CFClient::UI::Base::; 2094our @ISA = CFClient::UI::Base::;
1917 2095
1918use CFClient::OpenGL; 2096use CFClient::OpenGL;
1919use Carp qw/confess/;
1920 2097
1921our %loaded_images; 2098our %texture_cache;
1922 2099
1923sub new { 2100sub new {
1924 my $class = shift; 2101 my $class = shift;
1925 2102
1926 my $self = $class->SUPER::new (can_events => 0, @_); 2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
1927 2107
1928 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2108 $self->{path}
2109 or Carp::croak "required attribute 'path' not set";
1929 2110
1930 $loaded_images{$self->{image}} ||= 2111 $self->{tex} = $texture_cache{$self->{path}} ||=
1931 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1932 2113
1933 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2114 Scalar::Util::weaken $texture_cache{$self->{path}};
1934 2115
1935 Scalar::Util::weaken $loaded_images{$self->{image}}; 2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1936
1937 $self->{aspect} = $tex->{w} / $tex->{h};
1938 2117
1939 $self 2118 $self
1940} 2119}
1941 2120
1942sub size_request { 2121sub size_request {
1943 my ($self) = @_; 2122 my ($self) = @_;
1944 2123
1945 ($self->{tex}->{w}, $self->{tex}->{h}) 2124 ($self->{tex}{w}, $self->{tex}{h})
1946} 2125}
1947 2126
1948sub _draw { 2127sub _draw {
1949 my ($self) = @_; 2128 my ($self) = @_;
1950 2129
… …
2061 2240
2062 my $h1 = $self->{h} * (1 - $ycut1); 2241 my $h1 = $self->{h} * (1 - $ycut1);
2063 my $h2 = $self->{h} * (1 - $ycut2); 2242 my $h2 = $self->{h} * (1 - $ycut2);
2064 2243
2065 glEnable GL_BLEND; 2244 glEnable GL_BLEND;
2066 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067 glEnable GL_TEXTURE_2D; 2247 glEnable GL_TEXTURE_2D;
2068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2248 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069 2249
2070 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2250 glBindTexture GL_TEXTURE_2D, $t1->{name};
2071 glBegin GL_QUADS; 2251 glBegin GL_QUADS;
… …
2185 $self->update; 2365 $self->update;
2186 2366
2187 $self 2367 $self
2188} 2368}
2189 2369
2190sub changed { }
2191
2192sub set_range { 2370sub set_range {
2193 my ($self, $range) = @_; 2371 my ($self, $range) = @_;
2194 2372
2195 ($range, $self->{range}) = ($self->{range}, $range); 2373 ($range, $self->{range}) = ($self->{range}, $range);
2196 2374
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}"; 2375 if ("@$range" ne "@{$self->{range}}") {
2376 $self->update;
2377 $self->set_value ($self->{range}[0]);
2378 }
2199} 2379}
2200 2380
2201sub set_value { 2381sub set_value {
2202 my ($self, $value) = @_; 2382 my ($self, $value) = @_;
2203 2383
… …
2214 if $unit; 2394 if $unit;
2215 2395
2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2396 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217 2397
2218 if ($value != $old_value) { 2398 if ($value != $old_value) {
2219 $self->_emit (changed => $value); 2399 $self->emit (changed => $value);
2220 $self->update; 2400 $self->update;
2221 } 2401 }
2222} 2402}
2223 2403
2224sub size_request { 2404sub size_request {
2225 my ($self) = @_; 2405 my ($self) = @_;
2226 2406
2227 ($self->{req_w}, $self->{req_h}) 2407 ($self->{req_w}, $self->{req_h})
2228} 2408}
2229 2409
2230sub button_down { 2410sub invoke_button_down {
2231 my ($self, $ev, $x, $y) = @_; 2411 my ($self, $ev, $x, $y) = @_;
2232 2412
2233 $self->SUPER::button_down ($ev, $x, $y); 2413 $self->SUPER::invoke_button_down ($ev, $x, $y);
2234 2414
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2415 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236 2416
2237 $self->mouse_motion ($ev, $x, $y); 2417 $self->invoke_mouse_motion ($ev, $x, $y)
2238} 2418}
2239 2419
2240sub mouse_motion { 2420sub invoke_mouse_motion {
2241 my ($self, $ev, $x, $y) = @_; 2421 my ($self, $ev, $x, $y) = @_;
2242 2422
2243 if ($GRAB == $self) { 2423 if ($GRAB == $self) {
2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2424 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245 2425
2246 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2426 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247 2427
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2428 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249 2429
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2430 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2431 } else {
2432 return 0;
2433 }
2434
2251 } 2435 1
2252} 2436}
2253 2437
2254sub update { 2438sub update {
2255 my ($self) = @_; 2439 my ($self) = @_;
2256 2440
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2441 delete $self->{knob_w};
2442 $self->SUPER::update;
2443}
2444
2445sub _draw {
2446 my ($self) = @_;
2447
2448 unless ($self->{knob_w}) {
2258 $self->set_value ($self->{range}[0]); 2449 $self->set_value ($self->{range}[0]);
2259 2450
2260 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2451 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100; 2452 my $range = ($hi - $page - $lo) || 1e-100;
2262 2453
… …
2268 $value = ($value - $lo) / $range; 2459 $value = ($value - $lo) / $range;
2269 $value = $value * $self->{scale} + $self->{offset}; 2460 $value = $value * $self->{scale} + $self->{offset};
2270 2461
2271 $self->{knob_x} = $value - $knob_w * 0.5; 2462 $self->{knob_x} = $value - $knob_w * 0.5;
2272 $self->{knob_w} = $knob_w; 2463 $self->{knob_w} = $knob_w;
2273 }); 2464 }
2274
2275 $self->SUPER::update;
2276}
2277
2278sub _draw {
2279 my ($self) = @_;
2280 2465
2281 $self->SUPER::_draw (); 2466 $self->SUPER::_draw ();
2282 2467
2283 glScale $self->{w}, $self->{h}; 2468 glScale $self->{w}, $self->{h};
2284 2469
… …
2345sub set_range { shift->{slider}->set_range (@_) } 2530sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) } 2531sub set_value { shift->{slider}->set_value (@_) }
2347 2532
2348############################################################################# 2533#############################################################################
2349 2534
2350package CFClient::UI::TextView; 2535package CFClient::UI::TextScroller;
2351 2536
2352our @ISA = CFClient::UI::HBox::; 2537our @ISA = CFClient::UI::HBox::;
2353 2538
2354use CFClient::OpenGL; 2539use CFClient::OpenGL;
2355 2540
… …
2357 my $class = shift; 2542 my $class = shift;
2358 2543
2359 my $self = $class->SUPER::new ( 2544 my $self = $class->SUPER::new (
2360 fontsize => 1, 2545 fontsize => 1,
2361 can_events => 0, 2546 can_events => 0,
2547 indent => 0,
2362 #font => default_font 2548 #font => default_font
2363 @_, 2549 @_,
2364 2550
2365 layout => (new CFClient::Layout 1), 2551 layout => (new CFClient::Layout 1),
2366 par => [], 2552 par => [],
… …
2381 2567
2382 $self->{fontsize} = $fontsize; 2568 $self->{fontsize} = $fontsize;
2383 $self->reflow; 2569 $self->reflow;
2384} 2570}
2385 2571
2572sub visible_children {
2573 my ($self) = @_;
2574
2575 @{$self->{children}}[0,1]
2576}
2577
2386sub size_allocate { 2578sub invoke_size_allocate {
2387 my ($self, $w, $h, $changed) = @_; 2579 my ($self, $w, $h) = @_;
2388 2580
2389 $self->SUPER::size_allocate ($w, $h, $changed); 2581 my (undef, undef, @other) = @{ $self->{children} };
2390 2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2391 return unless $changed;
2392 2583
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2584 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2586 $self->{layout}->set_width ($self->{children}[0]{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2588
2397 $self->reflow; 2589 $self->reflow;
2398}
2399 2590
2400sub text_size { 2591 $self->SUPER::invoke_size_allocate ($w, $h)
2401 my ($self, $text, $indent) = @_; 2592}
2593
2594sub get_layout {
2595 my ($self, $para) = @_;
2402 2596
2403 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2404 2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2603 $layout->set_markup ($para->{markup});
2408 2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});
2605
2409 $layout->size 2606 $layout
2410} 2607}
2411 2608
2412sub reflow { 2609sub reflow {
2413 my ($self) = @_; 2610 my ($self) = @_;
2414 2611
… …
2423 $self->{children}[1]->set_value ($offset); 2620 $self->{children}[1]->set_value ($offset);
2424} 2621}
2425 2622
2426sub clear { 2623sub clear {
2427 my ($self) = @_; 2624 my ($self) = @_;
2625
2626 my (undef, undef, @other) = @{ $self->{children} };
2627 $self->remove ($_) for @other;
2428 2628
2429 $self->{par} = []; 2629 $self->{par} = [];
2430 $self->{height} = 0; 2630 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2632}
2433 2633
2434sub add_paragraph { 2634sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2635 my ($self, $color, $para, $indent) = @_;
2436 2636
2437 for my $line (split /\n/, $text) { 2637 my ($text, @w) = ref $para ? @$para : $para;
2438 my ($w, $h) = $self->text_size ($line); 2638
2439 $self->{height} += $h; 2639 $para = {
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2640 w => 1e10,
2641 wrapped => 1,
2642 fg => $color,
2643 indent => $indent,
2644 markup => $text,
2645 widget => \@w,
2441 } 2646 };
2442 2647
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2648 $self->add (@w) if @w;
2649 push @{$self->{par}}, $para;
2650
2651 $self->{need_reflow}++;
2652 $self->update;
2653}
2654
2655sub scroll_to_bottom {
2656 my ($self) = @_;
2657
2658 $self->{scroll_to_bottom} = 1;
2659 $self->update;
2444} 2660}
2445 2661
2446sub update { 2662sub update {
2447 my ($self) = @_; 2663 my ($self) = @_;
2448 2664
… …
2450 2666
2451 return unless $self->{h} > 0; 2667 return unless $self->{h} > 0;
2452 2668
2453 delete $self->{texture}; 2669 delete $self->{texture};
2454 2670
2455 $ROOT->on_post_alloc ($self, sub { 2671 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2673
2458 if (delete $self->{need_reflow}) { 2674 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2675 my $height = 0;
2460 2676
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) { 2677 for my $para (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2467 $layout->set_width ($W - $_->[3]); 2679 my $layout = $self->get_layout ($para);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2680 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2681
2682 $para->{w} = $w + $para->{indent};
2471 $_->[1] = $h; 2683 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped;
2472 } 2685 }
2473 2686
2474 $height += $_->[1]; 2687 $height += $para->{h};
2475 } 2688 }
2476 2689
2477 $self->{height} = $height; 2690 $self->{height} = $height;
2478 2691
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2692 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2480 2693
2481 delete $self->{texture}; 2694 delete $self->{texture};
2482 } 2695 }
2483 2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2699 }
2700
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2701 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2702 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2703 glClear GL_COLOR_BUFFER_BIT;
2487 2704
2488 my $top = int $self->{children}[1]{range}[0]; 2705 my $top = int $self->{children}[1]{range}[0];
2489 2706
2490 my $y0 = $top; 2707 my $y0 = $top;
2491 my $y1 = $top + $H; 2708 my $y1 = $top + $H;
2492 2709
2493 my $y = 0; 2710 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498 2711
2499 glEnable GL_BLEND; 2712 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off 2713 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502 2715
2503 for my $par (@{$self->{par}}) { 2716 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 2717 my $h = $para->{h};
2505 2718
2506 if ($y0 < $y + $h && $y < $y1) { 2719 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 2720
2508 $layout->set_width ($W - $par->[3]); 2721 my $layout = $self->get_layout ($para);
2509 $layout->set_markup ($par->[4]);
2510 2722
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2512 2724
2513 glRasterPos $par->[3], $y - $y0; 2725 glRasterPos $para->{indent}, $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727
2728 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes;
2730
2731 for (@w) {
2732 my ($dx, $dy) = splice @s, 0, 2, ();
2733
2734 $_->{x} = $dx + $para->{indent};
2735 $_->{y} = $dy + $y - $y0;
2736
2737 $_->draw;
2738 }
2739 }
2515 } 2740 }
2516 2741
2517 $y += $h; 2742 $y += $h;
2518 } 2743 }
2519 2744
2520 glDisable GL_BLEND; 2745 glDisable GL_BLEND;
2521 }; 2746 };
2522 }); 2747 });
2523} 2748}
2524 2749
2750sub reconfigure {
2751 my ($self) = @_;
2752
2753 $self->SUPER::reconfigure;
2754
2755 $_->{w} = 1e10 for @{ $self->{par} };
2756 $self->reflow;
2757}
2758
2525sub _draw { 2759sub _draw {
2526 my ($self) = @_; 2760 my ($self) = @_;
2527 2761
2528 glEnable GL_TEXTURE_2D; 2762 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2764 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2765 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2533 2767
2534 $self->{children}[1]->draw; 2768 $self->{children}[1]->draw;
2535
2536} 2769}
2537 2770
2538############################################################################# 2771#############################################################################
2539 2772
2540package CFClient::UI::Animator; 2773package CFClient::UI::Animator;
… …
2619} 2852}
2620 2853
2621sub set_tooltip_from { 2854sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2855 my ($self, $widget) = @_;
2623 2856
2857 my $tooltip = $widget->{tooltip};
2858
2859 if ($ENV{CFPLUS_DEBUG} & 2) {
2860 $tooltip .= "\n\n" . (ref $widget) . "\n"
2861 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2862 . "req $widget->{req_w} $widget->{req_h}\n"
2863 . "visible $widget->{visible}";
2864 }
2865
2866 $tooltip =~ s/^\n+//;
2867 $tooltip =~ s/\n+$//;
2868
2624 $self->add (new CFClient::UI::Label 2869 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2870 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2872 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2873 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2874 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2875 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2882 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2638 2883
2639 ($w + 4, $h + 4) 2884 ($w + 4, $h + 4)
2640} 2885}
2641 2886
2642sub size_allocate { 2887sub invoke_size_allocate {
2643 my ($self, $w, $h, $changed) = @_; 2888 my ($self, $w, $h) = @_;
2644 2889
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2890 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2648} 2891}
2649 2892
2650sub visibility_change { 2893sub invoke_visibility_change {
2651 my ($self, $visible) = @_; 2894 my ($self, $visible) = @_;
2652 2895
2653 return unless $visible; 2896 return unless $visible;
2654 2897
2655 $self->{root}->on_post_alloc ("move_$self" => sub { 2898 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2657 or return; 2900 or return;
2658 2901
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2902 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660 2903
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2904 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH; 2905 if $x + $self->{w} > $self->{root}{w};
2663 2906
2664 $self->move_abs ($x, $y); 2907 $self->move_abs ($x, $y);
2665 }); 2908 });
2666} 2909}
2667 2910
… …
2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2999 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757 3000
2758 if ($tex) { 3001 if ($tex) {
2759 glEnable GL_TEXTURE_2D; 3002 glEnable GL_TEXTURE_2D;
2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3003 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761 glColor 1, 1, 1, 1; 3004 glColor 0, 0, 0, 1;
2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3005 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763 glDisable GL_TEXTURE_2D; 3006 glDisable GL_TEXTURE_2D;
2764 } 3007 }
2765} 3008}
2766 3009
2767sub DESTROY { 3010sub destroy {
2768 my ($self) = @_; 3011 my ($self) = @_;
2769 3012
2770 $self->{timer}->cancel 3013 $self->{timer}->cancel
2771 if $self->{timer}; 3014 if $self->{timer};
2772 3015
2773 $self->SUPER::DESTROY; 3016 $self->SUPER::destroy;
2774} 3017}
2775 3018
2776############################################################################# 3019#############################################################################
2777 3020
2778package CFClient::UI::Inventory; 3021package CFClient::UI::Buttonbar;
2779 3022
2780our @ISA = CFClient::UI::ScrolledWindow::; 3023our @ISA = CFClient::UI::HBox::;
2781 3024
2782sub new { 3025# 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 3026
2818############################################################################# 3027#############################################################################
2819 3028
2820package CFClient::UI::Menu; 3029package CFClient::UI::Menu;
2821 3030
… …
2833 ); 3042 );
2834 3043
2835 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3044 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2836 3045
2837 for my $item (@{ $self->{items} }) { 3046 for my $item (@{ $self->{items} }) {
2838 my ($widget, $cb) = @$item; 3047 my ($widget, $cb, $tooltip) = @$item;
2839 3048
2840 # handle various types of items, only text for now 3049 # handle various types of items, only text for now
2841 if (!ref $widget) { 3050 if (!ref $widget) {
2842 $widget = new CFClient::UI::Label 3051 $widget = new CFClient::UI::Label
2843 can_hover => 1, 3052 can_hover => 1,
2844 can_events => 1, 3053 can_events => 1,
2845 text => $widget; 3054 markup => $widget,
3055 tooltip => $tooltip
2846 } 3056 }
2847 3057
2848 $self->{item}{$widget} = $item; 3058 $self->{item}{$widget} = $item;
2849 3059
2850 $self->{vbox}->add ($widget); 3060 $self->{vbox}->add ($widget);
… …
2855 3065
2856# popup given the event (must be a mouse button down event currently) 3066# popup given the event (must be a mouse button down event currently)
2857sub popup { 3067sub popup {
2858 my ($self, $ev) = @_; 3068 my ($self, $ev) = @_;
2859 3069
2860 $self->_emit ("popdown"); 3070 $self->emit ("popdown");
2861 3071
2862 # maybe save $GRAB? must be careful about events... 3072 # maybe save $GRAB? must be careful about events...
2863 $GRAB = $self; 3073 $GRAB = $self;
2864 $self->{button} = $ev->{button}; 3074 $self->{button} = $ev->{button};
2865 3075
2866 $self->show; 3076 $self->show;
2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3077 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2868} 3078}
2869 3079
2870sub mouse_motion { 3080sub invoke_mouse_motion {
2871 my ($self, $ev, $x, $y) = @_; 3081 my ($self, $ev, $x, $y) = @_;
2872 3082
2873 # TODO: should use vbox->find_widget or so 3083 # TODO: should use vbox->find_widget or so
2874 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3084 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875 $self->{hover} = $self->{item}{$HOVER}; 3085 $self->{hover} = $self->{item}{$HOVER};
2876}
2877 3086
3087 0
3088}
3089
2878sub button_up { 3090sub invoke_button_up {
2879 my ($self, $ev, $x, $y) = @_; 3091 my ($self, $ev, $x, $y) = @_;
2880 3092
2881 if ($ev->{button} == $self->{button}) { 3093 if ($ev->{button} == $self->{button}) {
2882 undef $GRAB; 3094 undef $GRAB;
2883 $self->hide; 3095 $self->hide;
2884 3096
2885 $self->_emit ("popdown"); 3097 $self->emit ("popdown");
2886 $self->{hover}[1]->() if $self->{hover}; 3098 $self->{hover}[1]->() if $self->{hover};
3099 } else {
3100 return 0
3101 }
3102
2887 } 3103 1
2888} 3104}
2889 3105
2890############################################################################# 3106#############################################################################
2891 3107
2892package CFClient::UI::Statusbox; 3108package CFClient::UI::Multiplexer;
2893 3109
2894our @ISA = CFClient::UI::VBox::; 3110our @ISA = CFClient::UI::Container::;
2895 3111
2896sub new { 3112sub new {
2897 my $class = shift; 3113 my $class = shift;
2898 3114
2899 $class->SUPER::new ( 3115 my $self = $class->SUPER::new (
3116 @_,
3117 );
3118
3119 $self->{current} = $self->{children}[0]
3120 if @{ $self->{children} };
3121
3122 $self
3123}
3124
3125sub add {
3126 my ($self, @widgets) = @_;
3127
3128 $self->SUPER::add (@widgets);
3129
3130 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} };
3132}
3133
3134sub set_current_page {
3135 my ($self, $page_or_widget) = @_;
3136
3137 my $widget = ref $page_or_widget
3138 ? $page_or_widget
3139 : $self->{children}[$page_or_widget];
3140
3141 $self->{current} = $widget;
3142 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3143
3144 $self->emit (page_changed => $self->{current});
3145
3146 $self->realloc;
3147}
3148
3149sub visible_children {
3150 $_[0]{current}
3151}
3152
3153sub size_request {
3154 my ($self) = @_;
3155
3156 $self->{current}->size_request
3157}
3158
3159sub invoke_size_allocate {
3160 my ($self, $w, $h) = @_;
3161
3162 $self->{current}->configure (0, 0, $w, $h);
3163
3164 1
3165}
3166
3167sub _draw {
3168 my ($self) = @_;
3169
3170 $self->{current}->draw;
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Notebook;
3176
3177our @ISA = CFClient::UI::VBox::;
3178
3179sub new {
3180 my $class = shift;
3181
3182 my $self = $class->SUPER::new (
3183 buttonbar => (new CFClient::UI::Buttonbar),
3184 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3185 # filter => # will be put between multiplexer and $self
3186 @_,
3187 );
3188
3189 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3190 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3191
3192 $self
3193}
3194
3195sub add {
3196 my ($self, $title, $widget, $tooltip) = @_;
3197
3198 Scalar::Util::weaken $self;
3199
3200 $self->{buttonbar}->add (new CFClient::UI::Button
3201 markup => $title,
3202 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) },
3204 );
3205
3206 $self->{multiplexer}->add ($widget);
3207}
3208
3209sub set_current_page {
3210 my ($self, $page) = @_;
3211
3212 $self->{multiplexer}->set_current_page ($page);
3213 $self->emit (page_changed => $self->{multiplexer}{current});
3214}
3215
3216#############################################################################
3217
3218package CFClient::UI::Combobox;
3219
3220use utf8;
3221
3222our @ISA = CFClient::UI::Button::;
3223
3224sub new {
3225 my $class = shift;
3226
3227 my $self = $class->SUPER::new (
3228 options => [], # [value, title, longdesc], ...
3229 value => undef,
3230 @_,
3231 );
3232
3233 $self->_set_value ($self->{value});
3234
3235 $self
3236}
3237
3238sub invoke_button_down {
3239 my ($self, $ev) = @_;
3240
3241 my @menu_items;
3242
3243 for (@{ $self->{options} }) {
3244 my ($value, $title, $tooltip) = @$_;
3245
3246 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247 }
3248
3249 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250}
3251
3252sub _set_value {
3253 my ($self, $value) = @_;
3254
3255 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3256 or return;
3257
3258 $self->{value} = $item->[0];
3259 $self->set_markup ("$item->[1] ⇓");
3260 $self->set_tooltip ($item->[2]);
3261}
3262
3263sub set_value {
3264 my ($self, $value) = @_;
3265
3266 return unless $self->{value} ne $value;
3267
3268 $self->_set_value ($value);
3269 $self->emit (changed => $value);
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::Statusbox;
3275
3276our @ISA = CFClient::UI::VBox::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (
2900 fontsize => 0.8, 3282 fontsize => 0.8,
2901 @_, 3283 @_,
2902 ) 3284 );
3285
3286 Scalar::Util::weaken (my $this = $self);
3287
3288 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3289
3290 $self
2903} 3291}
2904 3292
2905sub reorder { 3293sub reorder {
2906 my ($self) = @_; 3294 my ($self) = @_;
2907 my $NOW = time; 3295 my $NOW = Time::HiRes::time;
3296
3297 # freeze display when hovering over any label
3298 return if $CFClient::UI::TOOLTIP->{owner}
3299 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3300 values %{ $self->{item} };
2908 3301
2909 while (my ($k, $v) = each %{ $self->{item} }) { 3302 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3303 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 } 3304 }
2912 3305
… …
2915 my @items = sort { 3308 my @items = sort {
2916 $a->{pri} <=> $b->{pri} 3309 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id} 3310 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} }; 3311 } values %{ $self->{item} };
2919 3312
3313 $self->{timer}->interval (1);
3314
2920 my $count = 10 + 1; 3315 my $count = 10 + 1;
2921 for my $item (@items) { 3316 for my $item (@items) {
2922 last unless --$count; 3317 last unless --$count;
2923 3318
2924 push @widgets, $item->{label} ||= do { 3319 my $label = $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all) 3320 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1 3321 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}" 3322 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text}; 3323 : $item->{text};
2929 3324
… …
2937 tooltip => $item->{tooltip}, 3332 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP, 3333 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67, 3334 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize}, 3335 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44, 3336 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg}, 3337 fg => [@{ $item->{fg} }],
2943 can_events => 1, 3338 can_events => 1,
2944 can_hover => 1 3339 can_hover => 1
2945 }; 3340 };
3341
3342 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3343 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3344 $label->update;
3345 $label->set_max_size (undef, $label->{req_h} * $diff)
3346 if $diff < 1;
3347 $self->{timer}->interval (1/30);
3348 } else {
3349 $label->{fg}[3] = $item->{fg}[3] || 1;
3350 }
3351
3352 push @widgets, $label;
2946 } 3353 }
2947 3354
2948 $self->clear; 3355 $self->clear;
2949 $self->SUPER::add (reverse @widgets); 3356 $self->SUPER::add (reverse @widgets);
2950} 3357}
… …
2955 $text =~ s/^\s+//; 3362 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//; 3363 $text =~ s/\s+$//;
2957 3364
2958 return unless $text; 3365 return unless $text;
2959 3366
2960 my $timeout = time + ((delete $arg{timeout}) || 60); 3367 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961 3368
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3369 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963 3370
2964 if (my $item = $self->{item}{$group}) { 3371 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) { 3372 if ($item->{text} eq $text) {
2966 $item->{count}++; 3373 $item->{count}++;
2967 } else { 3374 } else {
2968 $item->{count} = 1; 3375 $item->{count} = 1;
2969 $item->{text} = $item->{tooltip} = $text; 3376 $item->{text} = $item->{tooltip} = $text;
2970 } 3377 }
2971 $item->{id} = ++$self->{id}; 3378 $item->{id} += 0.2;#d#
2972 $item->{timeout} = $timeout; 3379 $item->{timeout} = $timeout;
2973 delete $item->{label}; 3380 delete $item->{label};
2974 } else { 3381 } else {
2975 $self->{item}{$group} = { 3382 $self->{item}{$group} = {
2976 id => ++$self->{id}, 3383 id => ++$self->{id},
… …
2995 3402
2996 $self->reorder; 3403 $self->reorder;
2997 $self->SUPER::reconfigure; 3404 $self->SUPER::reconfigure;
2998} 3405}
2999 3406
3407sub destroy {
3408 my ($self) = @_;
3409
3410 $self->{timer}->cancel;
3411
3412 $self->SUPER::destroy;
3413}
3414
3000############################################################################# 3415#############################################################################
3001 3416
3417package CFClient::UI::Inventory;
3418
3419our @ISA = CFClient::UI::ScrolledWindow::;
3420
3421sub new {
3422 my $class = shift;
3423
3424 my $self = $class->SUPER::new (
3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3426 @_,
3427 );
3428
3429 $self
3430}
3431
3432sub set_items {
3433 my ($self, $items) = @_;
3434
3435 $self->{child}->clear;
3436 return unless $items;
3437
3438 my @items = sort {
3439 ($a->{type} <=> $b->{type})
3440 or ($a->{name} cmp $b->{name})
3441 } @$items;
3442
3443 $self->{real_items} = \@items;
3444
3445 my $row = 0;
3446 for my $item (@items) {
3447 CFClient::Item::update_widgets $item;
3448
3449 $self->{child}->add (0, $row, $item->{face_widget});
3450 $self->{child}->add (1, $row, $item->{desc_widget});
3451 $self->{child}->add (2, $row, $item->{weight_widget});
3452
3453 $row++;
3454 }
3455}
3456
3457#############################################################################
3458
3459package CFClient::UI::BindEditor;
3460
3461our @ISA = CFClient::UI::FancyFrame::;
3462
3463sub new {
3464 my $class = shift;
3465
3466 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3467
3468 $self->add (my $vb = new CFClient::UI::VBox);
3469
3470
3471 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3472 text => "start recording",
3473 tooltip => "Start/Stops recording of actions."
3474 ."All subsequent actions after the recording started will be captured."
3475 ."The actions are displayed after the record was stopped."
3476 ."To bind the action you have to click on the 'Bind' button",
3477 on_activate => sub {
3478 unless ($self->{recording}) {
3479 $self->start;
3480 } else {
3481 $self->stop;
3482 }
3483 });
3484
3485 $vb->add (new CFClient::UI::Label text => "Actions:");
3486 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3487
3488 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3489 $vb->add (my $hb = new CFClient::UI::HBox);
3490 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3491 $hb->add (new CFClient::UI::Button
3492 text => "bind",
3493 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3494 on_activate => sub {
3495 $self->ask_for_bind;
3496 });
3497
3498 $vb->add (my $hb = new CFClient::UI::HBox);
3499 $hb->add (new CFClient::UI::Button
3500 text => "ok",
3501 expand => 1,
3502 tooltip => "This closes the binding editor and saves the binding",
3503 on_activate => sub {
3504 $self->hide;
3505 $self->commit;
3506 });
3507
3508 $hb->add (new CFClient::UI::Button
3509 text => "cancel",
3510 expand => 1,
3511 tooltip => "This closes the binding editor without saving",
3512 on_activate => sub {
3513 $self->hide;
3514 $self->{binding_cancel}->()
3515 if $self->{binding_cancel};
3516 });
3517
3518 $self->update_binding_widgets;
3519
3520 $self
3521}
3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3535sub commit {
3536 my ($self) = @_;
3537 my ($mod, $sym, $cmds) = $self->get_binding;
3538 if ($sym != 0 && @$cmds > 0) {
3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3540 ."'. Don't forget 'Save Config'!");
3541 $self->{binding_change}->($mod, $sym, $cmds)
3542 if $self->{binding_change};
3543 } else {
3544 $::STATUSBOX->add ("No action bound, no key or action specified!");
3545 $self->{binding_cancel}->()
3546 if $self->{binding_cancel};
3547 }
3548}
3549
3550sub start {
3551 my ($self) = @_;
3552
3553 $self->{rec_btn}->set_text ("stop recording");
3554 $self->{recording} = 1;
3555 $self->clear_command_list;
3556 $::CONN->start_record if $::CONN;
3557}
3558
3559sub stop {
3560 my ($self) = @_;
3561
3562 $self->{rec_btn}->set_text ("start recording");
3563 $self->{recording} = 0;
3564
3565 my $rec;
3566 $rec = $::CONN->stop_record if $::CONN;
3567 return unless ref $rec eq 'ARRAY';
3568 $self->set_command_list ($rec);
3569}
3570
3571
3572sub ask_for_bind_and_commit {
3573 my ($self) = @_;
3574 $self->ask_for_bind (1);
3575}
3576
3577sub ask_for_bind {
3578 my ($self, $commit, $end_cb) = @_;
3579
3580 CFClient::Binder::open_binding_dialog (sub {
3581 my ($mod, $sym) = @_;
3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3583 $self->update_binding_widgets;
3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3586 });
3587}
3588
3589# $mod and $sym are the modifiers and key symbol
3590# $cmds is a array ref of strings (the commands)
3591# $cb is the callback that is executed on OK
3592# $ccb is the callback that is executed on CANCEL and
3593# when the binding was unsuccessful on OK
3594sub set_binding {
3595 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3596
3597 $self->clear_command_list;
3598 $self->{recording} = 0;
3599 $self->{rec_btn}->set_text ("start recording");
3600
3601 $self->{binding} = [$mod, $sym];
3602 $self->{commands} = $cmds;
3603
3604 $self->{binding_change} = $cb;
3605 $self->{binding_cancel} = $ccb;
3606
3607 $self->update_binding_widgets;
3608}
3609
3610# this is a shortcut method that asks for a binding
3611# and then just binds it.
3612sub do_quick_binding {
3613 my ($self, $cmds, $end_cb) = @_;
3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3615 $self->ask_for_bind (1, $end_cb);
3616}
3617
3618sub update_binding_widgets {
3619 my ($self) = @_;
3620 my ($mod, $sym, $cmds) = $self->get_binding;
3621 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3622 $self->set_command_list ($cmds);
3623}
3624
3625sub get_binding {
3626 my ($self) = @_;
3627 return (
3628 $self->{binding}->[0],
3629 $self->{binding}->[1],
3630 [ grep { defined $_ } @{$self->{commands}} ]
3631 );
3632}
3633
3634sub clear_command_list {
3635 my ($self) = @_;
3636 $self->{cmdbox}->clear ();
3637}
3638
3639sub set_command_list {
3640 my ($self, $cmds) = @_;
3641
3642 $self->{cmdbox}->clear ();
3643 $self->{commands} = $cmds;
3644
3645 my $idx = 0;
3646
3647 for (@$cmds) {
3648 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3649
3650 my $i = $idx;
3651 $hb->add (new CFClient::UI::Label text => $_);
3652 $hb->add (new CFClient::UI::Button
3653 text => "delete",
3654 tooltip => "Deletes the action from the record",
3655 on_activate => sub {
3656 $self->{cmdbox}->remove ($hb);
3657 $cmds->[$i] = undef;
3658 });
3659
3660
3661 $idx++
3662 }
3663}
3664
3665#############################################################################
3666
3667package CFClient::UI::SpellList;
3668
3669our @ISA = CFClient::UI::Table::;
3670
3671sub new {
3672 my $class = shift;
3673
3674 my $self = $class->SUPER::new (
3675 binding => [],
3676 commands => [],
3677 @_,
3678 )
3679}
3680
3681my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3682
3683my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3684 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3685my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3686 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3687my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3688 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3689my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3690 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3691my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3693
3694sub rebuild_spell_list {
3695 my ($self) = @_;
3696
3697 $CFClient::UI::ROOT->on_refresh ($self => sub {
3698 $self->clear;
3699
3700 return unless $::CONN;
3701
3702 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3704 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3705 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3706 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3707
3708 my $row = 0;
3709
3710 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3711 my $spell = $self->{spell}{$_};
3712
3713 $row++;
3714
3715 my $spell_cb = sub {
3716 my ($widget, $ev) = @_;
3717
3718 if ($ev->{button} == 1) {
3719 $::CONN->user_send ("cast $spell->{name}");
3720 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu
3724 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ],
3728 )->popup ($ev);
3729 } else {
3730 return 0;
3731 }
3732
3733 1
3734 };
3735
3736 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3737
3738 #TODO: add path info to tooltip
3739 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3740
3741 $self->add (0, $row, new CFClient::UI::Face
3742 face => $spell->{face},
3743 can_hover => 1,
3744 can_events => 1,
3745 tooltip => $tooltip,
3746 on_button_down => $spell_cb,
3747 );
3748
3749 $self->add (1, $row, new CFClient::UI::Label
3750 expand => 1,
3751 text => $spell->{name},
3752 can_hover => 1,
3753 can_events => 1,
3754 tooltip => $tooltip,
3755 on_button_down => $spell_cb,
3756 );
3757
3758 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3759 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3760 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3761 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3762 }
3763 });
3764}
3765
3766sub add_spell {
3767 my ($self, $spell) = @_;
3768
3769 $self->{spell}->{$spell->{name}} = $spell;
3770 $self->rebuild_spell_list;
3771}
3772
3773sub remove_spell {
3774 my ($self, $spell) = @_;
3775
3776 delete $self->{spell}->{$spell->{name}};
3777 $self->rebuild_spell_list;
3778}
3779
3780sub clear_spells {
3781 my ($self) = @_;
3782
3783 $self->{spell} = {};
3784 $self->rebuild_spell_list;
3785}
3786
3787#############################################################################
3788
3002package CFClient::UI::Root; 3789package CFClient::UI::Root;
3003 3790
3004our @ISA = CFClient::UI::Container::; 3791our @ISA = CFClient::UI::Container::;
3792
3793use List::Util qw(min max);
3005 3794
3006use CFClient::OpenGL; 3795use CFClient::OpenGL;
3007 3796
3008sub new { 3797sub new {
3009 my $class = shift; 3798 my $class = shift;
… …
3016 Scalar::Util::weaken ($self->{root} = $self); 3805 Scalar::Util::weaken ($self->{root} = $self);
3017 3806
3018 $self 3807 $self
3019} 3808}
3020 3809
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 { 3810sub size_request {
3038 my ($self) = @_; 3811 my ($self) = @_;
3039 3812
3040 ($self->{w}, $self->{h}) 3813 ($self->{w}, $self->{h})
3041} 3814}
… …
3052 $coord = $max - $size if $coord > $max - $size; 3825 $coord = $max - $size if $coord > $max - $size;
3053 3826
3054 int $coord + 0.5 3827 int $coord + 0.5
3055} 3828}
3056 3829
3057sub size_allocate { 3830sub invoke_size_allocate {
3058 my ($self, $w, $h, $changed) = @_; 3831 my ($self, $w, $h) = @_;
3059 3832
3060 for my $child ($self->children) { 3833 for my $child ($self->children) {
3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3834 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062 3835
3063 $X = $child->{force_x} if exists $child->{force_x}; 3836 $X = $child->{force_x} if exists $child->{force_x};
… …
3066 $X = _to_pixel $X, $W, $self->{w}; 3839 $X = _to_pixel $X, $W, $self->{w};
3067 $Y = _to_pixel $Y, $H, $self->{h}; 3840 $Y = _to_pixel $Y, $H, $self->{h};
3068 3841
3069 $child->configure ($X, $Y, $W, $H); 3842 $child->configure ($X, $Y, $W, $H);
3070 } 3843 }
3844
3845 1
3071} 3846}
3072 3847
3073sub coord2local { 3848sub coord2local {
3074 my ($self, $x, $y) = @_; 3849 my ($self, $x, $y) = @_;
3075 3850
… …
3131 $_->() 3906 $_->()
3132 for values %{delete $self->{refresh_hook}}; 3907 for values %{delete $self->{refresh_hook}};
3133 } 3908 }
3134 3909
3135 if ($self->{realloc}) { 3910 if ($self->{realloc}) {
3911 my %queue;
3136 my @queue; 3912 my @queue;
3913 my $widget;
3137 3914
3915 outer:
3138 while () { 3916 while () {
3139 if ($self->{realloc}) { 3917 if (my $realloc = delete $self->{realloc}) {
3140 #TODO use array-of-depth approach 3918 for $widget (values %$realloc) {
3919 $widget->{visible} or next; # do not resize invisible widgets
3141 3920
3142 @queue = sort { $a->{visible} <=> $b->{visible} } 3921 $queue{$widget+0}++ and next; # duplicates are common
3143 @queue, values %{delete $self->{realloc}}; 3922
3923 push @{ $queue[$widget->{visible}] }, $widget;
3924 }
3144 } 3925 }
3145 3926
3927 while () {
3928 @queue or last outer;
3929
3146 my $widget = pop @queue || last; 3930 $widget = pop @{ $queue[-1] || [] }
3931 and last;
3932
3933 pop @queue;
3934 }
3147 3935
3148 $widget->{visible} or last; # do not resize invisible widgets 3936 delete $queue{$widget+0};
3149 3937
3150 my ($w, $h) = $widget->size_request; 3938 my ($w, $h) = $widget->size_request;
3151 3939
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3940 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3941 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3942
3943 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3944 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154 3945
3155 $w = $widget->{force_w} if exists $widget->{force_w}; 3946 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h}; 3947 $h = $widget->{force_h} if exists $widget->{force_h};
3157 3948
3949 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3950 || delete $widget->{force_realloc}) {
3158 $widget->{req_w} = $w; 3951 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h; 3952 $widget->{req_h} = $h;
3160 3953
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3954 $self->{size_alloc}{$widget+0} = $widget;
3162 3955
3163 push @queue, $widget->{parent} 3956 if (my $parent = $widget->{parent}) {
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3957 $self->{realloc}{$parent+0} = $parent
3958 unless $queue{$parent+0};
3959
3960 $parent->{force_size_alloc} = 1;
3961 $self->{size_alloc}{$parent+0} = $parent;
3962 }
3963 }
3964
3965 delete $self->{realloc}{$widget+0};
3165 } 3966 }
3166 } 3967 }
3167 3968
3168 while (my $size_alloc = delete $self->{size_alloc}) { 3969 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3970 my @queue = sort { $b->{visible} <=> $a->{visible} }
3170 values %$size_alloc; 3971 values %$size_alloc;
3171 3972
3172 while () { 3973 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last }; 3974 my $widget = pop @queue || last;
3174 3975
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177 3977
3178 $w = 0 if $w < 0; 3978 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0; 3979 $h = 0 if $h < 0;
3180 3980
3181 $w = int $w + 0.5; 3981 $w = int $w + 0.5;
3182 $h = int $h + 0.5; 3982 $h = int $h + 0.5;
3183 3983
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3984 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985 $widget->{old_w} = $widget->{w};
3986 $widget->{old_h} = $widget->{h};
3185 3987
3186 $widget->{w} = $w; 3988 $widget->{w} = $w;
3187 $widget->{h} = $h; 3989 $widget->{h} = $h;
3188 3990
3189 $widget->emit (size_allocate => $w, $h, $changed); 3991 $widget->emit (size_allocate => $w, $h);
3992 }
3190 } 3993 }
3191 } 3994 }
3192 3995
3193 while ($self->{post_alloc_hook}) { 3996 while ($self->{post_alloc_hook}) {
3194 $_->() 3997 $_->()
3195 for values %{delete $self->{post_alloc_hook}}; 3998 for values %{delete $self->{post_alloc_hook}};
3196 } 3999 }
4000
3197 4001
3198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4002 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4003 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200 glClear GL_COLOR_BUFFER_BIT; 4004 glClear GL_COLOR_BUFFER_BIT;
3201 4005
… …
3203 glLoadIdentity; 4007 glLoadIdentity;
3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4008 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205 glMatrixMode GL_MODELVIEW; 4009 glMatrixMode GL_MODELVIEW;
3206 glLoadIdentity; 4010 glLoadIdentity;
3207 4011
4012 {
4013 package CFClient::UI::Base;
4014
4015 ($draw_x, $draw_y, $draw_w, $draw_h) =
4016 (0, 0, $self->{w}, $self->{h});
4017 }
4018
3208 $self->_draw; 4019 $self->_draw;
3209} 4020}
3210 4021
3211############################################################################# 4022#############################################################################
3212 4023

Diff Legend

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