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.284 by root, Mon Jun 5 03:06:04 2006 UTC vs.
Revision 1.353 by root, Thu Nov 16 19:42:45 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event; 8use Event;
9 9
10use CFClient; 10use CFPlus;
11use CFPlus::Pod;
11use CFClient::Texture; 12use CFPlus::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
… …
18our $BUTTON_STATE; 19our $BUTTON_STATE;
19 20
20our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
21 22
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 return if $ENV{CFPLUS_DEBUG} & 8;
24
25 if (!$GRAB) { 24 if (!$GRAB) {
26 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
27 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
28 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
29 $TOOLTIP->hide; 28 $TOOLTIP->hide;
30 29
31 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31
32 return if $ENV{CFPLUS_DEBUG} & 8;
32 33
33 my $tip = $widget->{tooltip}; 34 my $tip = $widget->{tooltip};
34 35
35 $tip = $tip->($widget) if CODE:: eq ref $tip; 36 $tip = $tip->($widget) if CODE:: eq ref $tip;
36 37
… …
79sub feed_sdl_key_up_event { 80sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 81 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 82 if $FOCUS;
82} 83}
83 84
85sub check_hover {
86 my ($widget) = @_;
87
88 if ($widget != $HOVER) {
89 my $hover = $HOVER; $HOVER = $widget;
90
91 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover};
93
94 $TOOLTIP_WATCHER->start;
95 }
96}
97
84sub feed_sdl_button_down_event { 98sub feed_sdl_button_down_event {
85 my ($ev) = @_; 99 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
87 101
88 if (!$BUTTON_STATE) { 102 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
103
104 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 105 my $widget = $ROOT->find_widget ($x, $y);
90 106
91 $GRAB = $widget; 107 $GRAB = $widget;
92 $GRAB->update if $GRAB; 108 $GRAB->update if $GRAB;
93 109
94 $TOOLTIP_WATCHER->cb->(); 110 $TOOLTIP_WATCHER->cb->();
95 } 111 }
96 112
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 113 if ($GRAB) {
98 114 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 115 # mousewheel
100 if $GRAB; 116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9;
118 $GRAB->emit (mouse_wheel => $ev);
119 } else {
120 $GRAB->emit (button_down => $ev)
121 }
122 }
101} 123}
102 124
103sub feed_sdl_button_up_event { 125sub feed_sdl_button_up_event {
104 my ($ev) = @_; 126 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 127
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 128 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 129
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 130 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 131
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 132 $GRAB->emit (button_up => $ev)
112 if $GRAB; 133 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 134
114 if (!$BUTTON_STATE) { 135 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 136 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 137 $grab->update if $grab;
117 $GRAB->update if $GRAB; 138 $GRAB->update if $GRAB;
118 139
140 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 141 $TOOLTIP_WATCHER->cb->();
120 } 142 }
121} 143}
122 144
123sub feed_sdl_motion_event { 145sub feed_sdl_motion_event {
124 my ($ev) = @_; 146 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 147 my ($x, $y) = ($ev->{x}, $ev->{y});
126 148
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 149 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 150
129 if ($widget != $HOVER) { 151 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 152
132 $hover->update if $hover && $hover->{can_hover}; 153 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 154 if $HOVER;
140} 155}
141 156
142# convert position array to integers 157# convert position array to integers
143sub harmonize { 158sub harmonize {
… …
193 reconfigure_widgets; 208 reconfigure_widgets;
194} 209}
195 210
196############################################################################# 211#############################################################################
197 212
213package CFPlus::UI::Event;
214
215sub xy {
216 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
217}
218
219#############################################################################
220
198package CFClient::UI::Base; 221package CFPlus::UI::Base;
199 222
200use strict; 223use strict;
201 224
202use CFClient::OpenGL; 225use CFPlus::OpenGL;
203 226
204sub new { 227sub new {
205 my $class = shift; 228 my $class = shift;
206 229
207 my $self = bless { 230 my $self = bless {
… …
212 h => undef, 235 h => undef,
213 can_events => 1, 236 can_events => 1,
214 @_ 237 @_
215 }, $class; 238 }, $class;
216 239
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 241
219 for (keys %$self) { 242 for (keys %$self) {
220 if (/^on_(.*)$/) { 243 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 244 $self->connect ($1 => delete $self->{$_});
222 } 245 }
223 } 246 }
224 247
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 249 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 250 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 251 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 252 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 253
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 254 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 255 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 256
234 $self->show if $layout->{show}; 257 $self->show if $layout->{show};
… …
247sub show { 270sub show {
248 my ($self) = @_; 271 my ($self) = @_;
249 272
250 return if $self->{parent}; 273 return if $self->{parent};
251 274
252 $CFClient::UI::ROOT->add ($self); 275 $CFPlus::UI::ROOT->add ($self);
253} 276}
254 277
255sub set_visible { 278sub set_visible {
256 my ($self) = @_; 279 my ($self) = @_;
257 280
… …
272 295
273 return unless $self->{visible}; 296 return unless $self->{visible};
274 297
275 $_->set_invisible for $self->children; 298 $_->set_invisible for $self->children;
276 299
300 delete $self->{visible};
277 delete $self->{root}; 301 delete $self->{root};
278 delete $self->{visible};
279 302
280 undef $GRAB if $GRAB == $self; 303 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 304 undef $HOVER if $HOVER == $self;
282 305
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 306 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 307 if $TOOLTIP->{owner} == $self;
285 308
286 $self->focus_out; 309 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 310 $self->emit (visibility_change => 0);
289} 311}
290 312
291sub set_visibility { 313sub set_visibility {
292 my ($self, $visible) = @_; 314 my ($self, $visible) = @_;
… …
315} 337}
316 338
317sub move_abs { 339sub move_abs {
318 my ($self, $x, $y, $z) = @_; 340 my ($self, $x, $y, $z) = @_;
319 341
320 $self->{x} = List::Util::max 0, int $x; 342 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 343 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 344 $self->{z} = $z if defined $z;
323 345
324 $self->update; 346 $self->update;
325} 347}
326 348
… …
336sub size_request { 358sub size_request {
337 require Carp; 359 require Carp;
338 Carp::confess "size_request is abstract"; 360 Carp::confess "size_request is abstract";
339} 361}
340 362
363sub baseline_shift {
364 0
365}
366
341sub configure { 367sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 368 my ($self, $x, $y, $w, $h) = @_;
343 369
344 if ($self->{aspect}) { 370 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 371 my ($ow, $oh) = ($w, $h);
346 372
347 $w = List::Util::min $w, int $h * $self->{aspect}; 373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 375
350 # use alignment to adjust x, y 376 # use alignment to adjust x, y
351 377
352 $x += int 0.5 * ($ow - $w); 378 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 379 $y += int 0.5 * ($oh - $h);
… …
367 393
368 $self->{root}{size_alloc}{$self+0} = $self; 394 $self->{root}{size_alloc}{$self+0} = $self;
369 } 395 }
370} 396}
371 397
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 398sub children {
377 # nop 399 # nop
378} 400}
379 401
380sub visible_children { 402sub visible_children {
… …
398 420
399 return if $self->{tooltip} eq $tooltip; 421 return if $self->{tooltip} eq $tooltip;
400 422
401 $self->{tooltip} = $tooltip; 423 $self->{tooltip} = $tooltip;
402 424
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 426 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 428 }
407} 429}
408 430
409# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
410sub coord2local { 432sub coord2local {
411 my ($self, $x, $y) = @_; 433 my ($self, $x, $y) = @_;
412 434
435 Carp::confess unless $self->{parent};#d#
436
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 438}
415 439
416# translate local coordinates to global coordinate system 440# translate local coordinates to global coordinate system
417sub coord2global { 441sub coord2global {
418 my ($self, $x, $y) = @_; 442 my ($self, $x, $y) = @_;
419 443
444 Carp::confess unless $self->{parent};#d#
445
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 447}
422 448
423sub focus_in { 449sub invoke_focus_in {
424 my ($self) = @_; 450 my ($self) = @_;
425 451
426 return if $FOCUS == $self; 452 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 453 return unless $self->{can_focus};
428 454
429 my $focus = $FOCUS; $FOCUS = $self; 455 $FOCUS = $self;
430 456
431 $self->_emit (focus_in => $focus); 457 $self->update;
432 458
433 $focus->update if $focus; 459 0
434 $FOCUS->update;
435} 460}
436 461
437sub focus_out { 462sub invoke_focus_out {
438 my ($self) = @_; 463 my ($self) = @_;
439 464
440 return unless $FOCUS == $self; 465 return unless $FOCUS == $self;
441 466
442 my $focus = $FOCUS; undef $FOCUS; 467 undef $FOCUS;
443 468
444 $self->_emit (focus_out => $focus); 469 $self->update;
445 470
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 471 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 472 unless $FOCUS;
450}
451 473
474 0
475}
476
477sub grab_focus {
478 my ($self) = @_;
479
480 $FOCUS->emit ("focus_out") if $FOCUS;
481 $self->emit ("focus_in");
482}
483
452sub mouse_motion { 0 } 484sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 485sub invoke_button_up { 0 }
454sub key_down { 0 } 486sub invoke_key_down { 0 }
455sub key_up { 0 } 487sub invoke_key_up { 0 }
488sub invoke_mouse_wheel { 0 }
456 489
457sub button_down { 490sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 491 my ($self, $ev, $x, $y) = @_;
459 492
460 $self->focus_in; 493 $self->grab_focus;
461 494
462 0 495 0
496}
497
498sub connect {
499 my ($self, $signal, $cb) = @_;
500
501 push @{ $self->{signal_cb}{$signal} }, $cb;
502
503 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} };
506 }
507}
508
509my %has_coords = (
510 button_down => 1,
511 button_up => 1,
512 mouse_motion => 1,
513 mouse_wheel => 1,
514);
515
516sub emit {
517 my ($self, $signal, @args) = @_;
518
519 # I do not really like this solution, but I dislike duplication
520 # and needlessly verbose code, too.
521 my @append
522 = $has_coords{$signal}
523 ? $args[0]->xy ($self)
524 : ();
525
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527
528 #d##TODO# stop propagating at first true, do not use sum
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 532}
464 533
465sub find_widget { 534sub find_widget {
466 my ($self, $x, $y) = @_; 535 my ($self, $x, $y) = @_;
467 536
… …
477sub set_parent { 546sub set_parent {
478 my ($self, $parent) = @_; 547 my ($self, $parent) = @_;
479 548
480 Scalar::Util::weaken ($self->{parent} = $parent); 549 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 550 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 551}
506 552
507sub realloc { 553sub realloc {
508 my ($self) = @_; 554 my ($self) = @_;
509 555
… …
542 return unless $self->{h} && $self->{w}; 588 return unless $self->{h} && $self->{w};
543 589
544 # update screen rectangle 590 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 591 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 592 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 593
550 # skip widgets that are entirely outside the drawing area 594 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 595 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 596 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 597
… …
576 glVertex $self->{w} - 1, 0; 620 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 621 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 622 glVertex 0 , $self->{h} - 1;
579 glEnd; 623 glEnd;
580 glPopMatrix; 624 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 625 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 } 626 }
583 627
584 $self->_draw; 628 $self->_draw;
585 glPopMatrix; 629 glPopMatrix;
586} 630}
… …
592} 636}
593 637
594sub DESTROY { 638sub DESTROY {
595 my ($self) = @_; 639 my ($self) = @_;
596 640
641 return if CFPlus::in_destruct;
642
597 delete $WIDGET{$self+0}; 643 delete $WIDGET{$self+0};
598 #$self->deactivate; 644
645 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 647}
600 648
601############################################################################# 649#############################################################################
602 650
603package CFClient::UI::DrawBG; 651package CFPlus::UI::DrawBG;
604 652
605our @ISA = CFClient::UI::Base::; 653our @ISA = CFPlus::UI::Base::;
606 654
607use strict; 655use strict;
608use CFClient::OpenGL; 656use CFPlus::OpenGL;
609 657
610sub new { 658sub new {
611 my $class = shift; 659 my $class = shift;
612 660
613 # range [value, low, high, page] 661 # range [value, low, high, page]
… …
644 } 692 }
645} 693}
646 694
647############################################################################# 695#############################################################################
648 696
649package CFClient::UI::Empty; 697package CFPlus::UI::Empty;
650 698
651our @ISA = CFClient::UI::Base::; 699our @ISA = CFPlus::UI::Base::;
652 700
653sub new { 701sub new {
654 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
655 $class->SUPER::new (can_events => 0, %arg); 703 $class->SUPER::new (can_events => 0, %arg);
656} 704}
… …
663 711
664sub draw { } 712sub draw { }
665 713
666############################################################################# 714#############################################################################
667 715
668package CFClient::UI::Container; 716package CFPlus::UI::Container;
669 717
670our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
671 719
672sub new { 720sub new {
673 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
674 722
675 my $children = delete $arg{children}; 723 my $children = delete $arg{children};
… …
684 if $children; 732 if $children;
685 733
686 $self 734 $self
687} 735}
688 736
737sub realloc {
738 my ($self) = @_;
739
740 $self->{force_realloc} = 1;
741 $self->{force_size_alloc} = 1;
742 $self->SUPER::realloc;
743}
744
689sub add { 745sub add {
690 my ($self, @widgets) = @_; 746 my ($self, @widgets) = @_;
691 747
692 $_->set_parent ($self) 748 $_->set_parent ($self)
693 for @widgets; 749 for @widgets;
… …
753 $_->draw for @{$self->{children}}; 809 $_->draw for @{$self->{children}};
754} 810}
755 811
756############################################################################# 812#############################################################################
757 813
758package CFClient::UI::Bin; 814package CFPlus::UI::Bin;
759 815
760our @ISA = CFClient::UI::Container::; 816our @ISA = CFPlus::UI::Container::;
761 817
762sub new { 818sub new {
763 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
764 820
765 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 821 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766 822
767 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
768} 824}
769 825
770sub add { 826sub add {
771 my ($self, $child) = @_; 827 my ($self, $child) = @_;
772 828
773 $self->{children} = []; 829 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 830 $self->SUPER::add ($child);
776} 831}
777 832
778sub remove { 833sub remove {
779 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
780 835
781 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
782 837
783 $self->{children} = [new CFClient::UI::Empty] 838 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 839 unless @{$self->{children}};
785} 840}
786 841
787sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
788 843
789sub size_request { 844sub size_request {
790 $_[0]{children}[0]->size_request 845 $_[0]{children}[0]->size_request
791} 846}
792 847
793sub size_allocate { 848sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 849 my ($self, $w, $h) = @_;
795 850
796 $self->{children}[0]->configure (0, 0, $w, $h); 851 $self->{children}[0]->configure (0, 0, $w, $h);
852
853 1
797} 854}
798 855
799############################################################################# 856#############################################################################
800 857
801# back-buffered drawing area 858# back-buffered drawing area
802 859
803package CFClient::UI::Window; 860package CFPlus::UI::Window;
804 861
805our @ISA = CFClient::UI::Bin::; 862our @ISA = CFPlus::UI::Bin::;
806 863
807use CFClient::OpenGL; 864use CFPlus::OpenGL;
808 865
809sub new { 866sub new {
810 my ($class, %arg) = @_; 867 my ($class, %arg) = @_;
811 868
812 my $self = $class->SUPER::new (%arg); 869 my $self = $class->SUPER::new (%arg);
… …
817 874
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 875 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 876 $self->SUPER::update;
820} 877}
821 878
822sub size_allocate { 879sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 880 my ($self, $w, $h) = @_;
824 881
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 882 $self->update;
883
884 $self->SUPER::invoke_size_allocate ($w, $h)
827} 885}
828 886
829sub _render { 887sub _render {
830 my ($self) = @_; 888 my ($self) = @_;
831 889
… …
833} 891}
834 892
835sub render_child { 893sub render_child {
836 my ($self) = @_; 894 my ($self) = @_;
837 895
838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 896 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
839 glClearColor 0, 0, 0, 0; 897 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT; 898 glClear GL_COLOR_BUFFER_BIT;
841 899
842 { 900 {
843 package CFClient::UI::Base; 901 package CFPlus::UI::Base;
844 902
845 ($draw_x, $draw_y, $draw_w, $draw_h) = 903 local ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
905
906 $self->_render;
847 } 907 }
848
849 $self->_render;
850 }; 908 };
851} 909}
852 910
853sub _draw { 911sub _draw {
854 my ($self) = @_; 912 my ($self) = @_;
855
856 my ($w, $h) = @$self{qw(w h)};
857 913
858 my $tex = $self->{texture} 914 my $tex = $self->{texture}
859 or return; 915 or return;
860 916
861 glEnable GL_TEXTURE_2D; 917 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 glColor 0, 0, 0, 1; 919 glColor 0, 0, 0, 1;
864 920
865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 921 $tex->draw_quad_alpha_premultiplied (0, 0);
866 922
867 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
868} 924}
869 925
870############################################################################# 926#############################################################################
871 927
872package CFClient::UI::ViewPort; 928package CFPlus::UI::ViewPort;
873 929
874our @ISA = CFClient::UI::Window::; 930our @ISA = CFPlus::UI::Window::;
875 931
876sub new { 932sub new {
877 my $class = shift; 933 my $class = shift;
878 934
879 $class->SUPER::new ( 935 $class->SUPER::new (
… …
892 $h = 10 if $self->{scroll_y}; 948 $h = 10 if $self->{scroll_y};
893 949
894 ($w, $h) 950 ($w, $h)
895} 951}
896 952
897sub size_allocate { 953sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 954 my ($self, $w, $h) = @_;
899 955
900 my $child = $self->child; 956 my $child = $self->child;
901 957
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 958 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 959 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 960
905 $self->child->configure (0, 0, $w, $h); 961 $self->child->configure (0, 0, $w, $h);
906 $self->update; 962 $self->update;
963
964 1
907} 965}
908 966
909sub set_offset { 967sub set_offset {
910 my ($self, $x, $y) = @_; 968 my ($self, $x, $y) = @_;
911 969
… …
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 997 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 999 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1001 }
944} 1002}
945 1003
946sub _render { 1004sub _render {
947 my ($self) = @_; 1005 my ($self) = @_;
948 1006
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1007 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1009
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1011
954 $self->SUPER::_render; 1012 $self->SUPER::_render;
955} 1013}
956 1014
957############################################################################# 1015#############################################################################
958 1016
959package CFClient::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
960 1018
961our @ISA = CFClient::UI::HBox::; 1019our @ISA = CFPlus::UI::HBox::;
962 1020
963sub new { 1021sub new {
964 my ($class, %arg) = @_; 1022 my ($class, %arg) = @_;
965 1023
966 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
967 1025
968 my $self; 1026 my $self;
969 1027
970 my $slider = new CFClient::UI::Slider 1028 my $slider = new CFPlus::UI::Slider
971 vertical => 1, 1029 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1030 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1031 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1032 $self->{vp}->set_offset (0, $_[1]);
975 }, 1033 },
976 ; 1034 ;
977 1035
978 $self = $class->SUPER::new ( 1036 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1037 vp => (new CFPlus::UI::ViewPort expand => 1),
1038 can_events => 1,
980 slider => $slider, 1039 slider => $slider,
981 %arg, 1040 %arg,
982 ); 1041 );
983 1042
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1043 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child; 1044 $self->add ($child) if $child;
986 1045
987 $self 1046 $self
988} 1047}
989 1048
1049#TODO# update range on size_allocate depending on child
1050
990sub add { 1051sub add {
991 my ($self, $widget) = @_; 1052 my ($self, $widget) = @_;
992 1053
993 $self->{vp}->add ($self->{child} = $widget); 1054 $self->{vp}->add ($self->{child} = $widget);
994} 1055}
995 1056
1057sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_;
1059
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev);
1063
1064 1
1065}
1066
1067sub update_slider {
1068 my ($self) = @_;
1069
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1071}
1072
996sub update { 1073sub update {
997 my ($self) = @_; 1074 my ($self) = @_;
998 1075
999 $self->SUPER::update; 1076 $self->SUPER::update;
1000 1077
1001 # todo: overwrite size_allocate of child 1078 $self->update_slider;
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1079}
1005 1080
1006sub size_allocate { 1081sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1082 my ($self, $w, $h) = @_;
1008 1083
1084 $self->update_slider;
1085
1009 $self->SUPER::size_allocate ($w, $h); 1086 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1087}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1088
1018############################################################################# 1089#############################################################################
1019 1090
1020package CFClient::UI::Frame; 1091package CFPlus::UI::Frame;
1021 1092
1022our @ISA = CFClient::UI::Bin::; 1093our @ISA = CFPlus::UI::Bin::;
1023 1094
1024use CFClient::OpenGL; 1095use CFPlus::OpenGL;
1025 1096
1026sub new { 1097sub new {
1027 my $class = shift; 1098 my $class = shift;
1028 1099
1029 $class->SUPER::new ( 1100 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1126 $self->SUPER::_draw;
1056} 1127}
1057 1128
1058############################################################################# 1129#############################################################################
1059 1130
1060package CFClient::UI::FancyFrame; 1131package CFPlus::UI::FancyFrame;
1061 1132
1062our @ISA = CFClient::UI::Bin::; 1133our @ISA = CFPlus::UI::Bin::;
1063 1134
1064use CFClient::OpenGL; 1135use CFPlus::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1136
1074sub new { 1137sub new {
1075 my ($class, %arg) = @_; 1138 my ($class, %arg) = @_;
1076 1139
1077 my $title = delete $arg{title}; 1140 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label
1142 align => 1,
1143 valign => 0,
1144 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75;
1146 }
1147
1148 my $self = $class->SUPER::new (
1149 # label => "",
1150 fg => [0.6, 0.3, 0.1],
1151 border => 0.8,
1152 style => 'single',
1153 %arg,
1154 );
1155
1156 $self
1157}
1158
1159sub add {
1160 my ($self, @widgets) = @_;
1161
1162 $self->SUPER::add (@widgets);
1163 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1164}
1165
1166sub border {
1167 int $_[0]{border} * $::FONTSIZE
1168}
1169
1170sub size_request {
1171 my ($self) = @_;
1172
1173 ($self->{label_w}, undef) = $self->{label}->size_request
1174 if $self->{label};
1175
1176 my ($w, $h) = $self->SUPER::size_request;
1177
1178 (
1179 $w + $self->border * 2,
1180 $h + $self->border * 2,
1181 )
1182}
1183
1184sub invoke_size_allocate {
1185 my ($self, $w, $h) = @_;
1186
1187 my $border = $self->border;
1188
1189 $w -= List::Util::max 0, $border * 2;
1190 $h -= List::Util::max 0, $border * 2;
1191
1192 if (my $label = $self->{label}) {
1193 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1194 $label->{h} = List::Util::min $h, $border;
1195 $label->invoke_size_allocate ($label->{w}, $label->{h});
1196 }
1197
1198 $self->child->configure ($border, $border, $w, $h);
1199
1200 1
1201}
1202
1203sub _draw {
1204 my ($self) = @_;
1205
1206 my $child = $self->{children}[0];
1207
1208 my $border = $self->border;
1209 my ($w, $h) = ($self->{w}, $self->{h});
1210
1211 $child->draw;
1212
1213 glColor @{$self->{fg}};
1214 glBegin GL_LINE_STRIP;
1215 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1216 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1217 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1218 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1219 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1220 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1221 glEnd;
1222
1223 if ($self->{label}) {
1224 glTranslate $border * 2, 0;
1225 $self->{label}->_draw;
1226 }
1227}
1228
1229#############################################################################
1230
1231package CFPlus::UI::Toplevel;
1232
1233our @ISA = CFPlus::UI::Bin::;
1234
1235use CFPlus::OpenGL;
1236
1237my $bg =
1238 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1239 mipmap => 1, wrap => 1;
1240
1241my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244
1245sub new {
1246 my ($class, %arg) = @_;
1078 1247
1079 my $self = $class->SUPER::new ( 1248 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1249 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1250 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1251 border => 0.6,
1083 can_events => 1, 1252 can_events => 1,
1084 min_w => 16, 1253 min_w => 64,
1085 min_h => 16, 1254 min_h => 32,
1086 %arg, 1255 %arg,
1087 ); 1256 );
1088 1257
1089 $self->{title} = new CFClient::UI::Label 1258 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1259 align => 0,
1091 valign => 1, 1260 valign => 1,
1092 text => $title, 1261 text => $self->{title},
1093 fontsize => $self->{border} 1262 fontsize => $self->{border},
1094 if defined $title; 1263 if exists $self->{title};
1264
1265 if ($self->{has_close_button}) {
1266 $self->{close_button} =
1267 new CFPlus::UI::ImageButton
1268 path => 'x1_close.png',
1269 on_activate => sub { $self->emit ("delete") };
1270
1271 $self->CFPlus::UI::Container::add ($self->{close_button});
1272 }
1095 1273
1096 $self 1274 $self
1097} 1275}
1098 1276
1099sub add { 1277sub add {
1100 my ($self, @widgets) = @_; 1278 my ($self, @widgets) = @_;
1101 1279
1102 $self->SUPER::add (@widgets); 1280 $self->SUPER::add (@widgets);
1281 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1282 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1283}
1105 1284
1106sub border { 1285sub border {
1107 int $_[0]{border} * $::FONTSIZE 1286 int $_[0]{border} * $::FONTSIZE
1108} 1287}
1109 1288
1110sub size_request { 1289sub size_request {
1111 my ($self) = @_; 1290 my ($self) = @_;
1112 1291
1113 $self->{title}->size_request 1292 $self->{title_widget}->size_request
1114 if $self->{title}; 1293 if $self->{title_widget};
1294
1295 $self->{close_button}->size_request
1296 if $self->{close_button};
1115 1297
1116 my ($w, $h) = $self->SUPER::size_request; 1298 my ($w, $h) = $self->SUPER::size_request;
1117 1299
1118 ( 1300 (
1119 $w + $self->border * 2, 1301 $w + $self->border * 2,
1120 $h + $self->border * 2, 1302 $h + $self->border * 2,
1121 ) 1303 )
1122} 1304}
1123 1305
1124sub size_allocate { 1306sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1307 my ($self, $w, $h) = @_;
1126 1308
1127 if ($self->{title}) { 1309 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1310 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1311 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1312 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1313 }
1132 1314
1133 my $border = $self->border; 1315 my $border = $self->border;
1134 1316
1135 $h -= List::Util::max 0, $border * 2; 1317 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1318 $w -= List::Util::max 0, $border * 2;
1319
1320 $self->child->configure ($border, $border, $w, $h);
1321
1322 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1323 if $self->{close_button};
1324
1325 1
1326}
1327
1328sub invoke_delete {
1329 my ($self) = @_;
1330
1331 $self->hide;
1137 1332
1138 $self->child->configure ($border, $border, $w, $h); 1333 1
1139} 1334}
1140 1335
1141sub button_down { 1336sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1337 my ($self, $ev, $x, $y) = @_;
1143 1338
1144 my ($w, $h) = @$self{qw(w h)}; 1339 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1340 my $border = $self->border;
1146 1341
… …
1177 1372
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1373 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1374
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1375 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1376 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1377 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1378 };
1184 } else { 1379 } else {
1185 return 0; 1380 return 0;
1186 } 1381 }
1187 1382
1188 1 1383 1
1189} 1384}
1190 1385
1191sub button_up { 1386sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1387 my ($self, $ev, $x, $y) = @_;
1193 1388
1194 !!delete $self->{motion} 1389 ! ! delete $self->{motion}
1195} 1390}
1196 1391
1197sub mouse_motion { 1392sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
1199 1394
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1395 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1396
1202 !!$self->{motion} 1397 ! ! $self->{motion}
1398}
1399
1400sub invoke_visibility_change {
1401 my ($self, $visible) = @_;
1402
1403 delete $self->{motion} unless $visible;
1404
1405 0
1203} 1406}
1204 1407
1205sub _draw { 1408sub _draw {
1206 my ($self) = @_; 1409 my ($self) = @_;
1207 1410
… …
1233 1436
1234 glDisable GL_TEXTURE_2D; 1437 glDisable GL_TEXTURE_2D;
1235 1438
1236 $child->draw; 1439 $child->draw;
1237 1440
1238 if ($self->{title}) { 1441 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1442 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1443 $self->{title_widget}->_draw;
1444
1445 glTranslate 0, - ($border - $self->{h});
1241 } 1446 }
1447
1448 $self->{close_button}->draw
1449 if $self->{close_button};
1242} 1450}
1243 1451
1244############################################################################# 1452#############################################################################
1245 1453
1246package CFClient::UI::Table; 1454package CFPlus::UI::Table;
1247 1455
1248our @ISA = CFClient::UI::Base::; 1456our @ISA = CFPlus::UI::Base::;
1249 1457
1250use List::Util qw(max sum); 1458use List::Util qw(max sum);
1251 1459
1252use CFClient::OpenGL; 1460use CFPlus::OpenGL;
1253 1461
1254sub new { 1462sub new {
1255 my $class = shift; 1463 my $class = shift;
1256 1464
1257 $class->SUPER::new ( 1465 $class->SUPER::new (
… …
1263sub children { 1471sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1473}
1266 1474
1267sub add { 1475sub add {
1268 my ($self, $x, $y, $child) = @_; 1476 my ($self) = shift;
1269 1477
1478 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1480 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1481 $self->{children}[$y][$x] = $child;
1482 }
1272 1483
1484 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1486 $self->realloc;
1487}
1488
1489sub remove {
1490 my ($self, $child) = @_;
1491
1492 # TODO: not yet implemented
1274} 1493}
1275 1494
1276# TODO: move to container class maybe? send children a signal on removal? 1495# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1496sub clear {
1278 my ($self) = @_; 1497 my ($self) = @_;
… …
1319 (sum @$ws), 1538 (sum @$ws),
1320 (sum @$hs), 1539 (sum @$hs),
1321 ) 1540 )
1322} 1541}
1323 1542
1324sub size_allocate { 1543sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1326 1545
1327 my ($ws, $hs) = $self->get_wh; 1546 my ($ws, $hs) = $self->get_wh;
1328 1547
1329 my $req_w = (sum @$ws) || 1; 1548 my $req_w = (sum @$ws) || 1;
… …
1336 1555
1337 # linearly scale sizes 1556 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1559
1341 CFClient::UI::harmonize $ws; 1560 CFPlus::UI::harmonize $ws;
1342 CFClient::UI::harmonize $hs; 1561 CFPlus::UI::harmonize $hs;
1343 1562
1344 my $y; 1563 my $y;
1345 1564
1346 for my $r (0 .. $#{$self->{children}}) { 1565 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1566 my $row = $self->{children}[$r]
… …
1361 } 1580 }
1362 1581
1363 $y += $row_h; 1582 $y += $row_h;
1364 } 1583 }
1365 1584
1585 1
1366} 1586}
1367 1587
1368sub find_widget { 1588sub find_widget {
1369 my ($self, $x, $y) = @_; 1589 my ($self, $x, $y) = @_;
1370 1590
… …
1389 } 1609 }
1390} 1610}
1391 1611
1392############################################################################# 1612#############################################################################
1393 1613
1394package CFClient::UI::Box; 1614package CFPlus::UI::Box;
1395 1615
1396our @ISA = CFClient::UI::Container::; 1616our @ISA = CFPlus::UI::Container::;
1397 1617
1398sub size_request { 1618sub size_request {
1399 my ($self) = @_; 1619 my ($self) = @_;
1400 1620
1401 $self->{vertical} 1621 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1627 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1628 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1629 )
1410} 1630}
1411 1631
1412sub size_allocate { 1632sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1633 my ($self, $w, $h) = @_;
1414 1634
1415 my $space = $self->{vertical} ? $h : $w; 1635 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1636 my @children = $self->visible_children;
1417 1637
1418 my @req; 1638 my @req;
1419 1639
1420 if ($self->{homogeneous}) { 1640 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1641 @req = ($space / (@children || 1)) x @children;
1422 } else { 1642 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1643 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1644 my $req = List::Util::sum @req;
1425 1645
1426 if ($req > $space) { 1646 if ($req > $space) {
1427 # ah well, not enough space 1647 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1648 $_ *= $space / $req for @req;
1429 } else { 1649 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1650 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1651
1432 $space = ($space - $req) / $expand; # remaining space to give away 1652 $space = ($space - $req) / $expand; # remaining space to give away
1433 1653
1434 $req[$_] += $space * $children->[$_]{expand} 1654 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1655 for 0 .. $#children;
1436 } 1656 }
1437 } 1657 }
1438 1658
1439 CFClient::UI::harmonize \@req; 1659 CFPlus::UI::harmonize \@req;
1440 1660
1441 my $pos = 0; 1661 my $pos = 0;
1442 for (0 .. $#$children) { 1662 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1663 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1664 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1665
1446 $pos += $alloc; 1666 $pos += $alloc;
1447 } 1667 }
1448 1668
1449 1 1669 1
1450} 1670}
1451 1671
1452############################################################################# 1672#############################################################################
1453 1673
1454package CFClient::UI::HBox; 1674package CFPlus::UI::HBox;
1455 1675
1456our @ISA = CFClient::UI::Box::; 1676our @ISA = CFPlus::UI::Box::;
1457 1677
1458sub new { 1678sub new {
1459 my $class = shift; 1679 my $class = shift;
1460 1680
1461 $class->SUPER::new ( 1681 $class->SUPER::new (
… …
1464 ) 1684 )
1465} 1685}
1466 1686
1467############################################################################# 1687#############################################################################
1468 1688
1469package CFClient::UI::VBox; 1689package CFPlus::UI::VBox;
1470 1690
1471our @ISA = CFClient::UI::Box::; 1691our @ISA = CFPlus::UI::Box::;
1472 1692
1473sub new { 1693sub new {
1474 my $class = shift; 1694 my $class = shift;
1475 1695
1476 $class->SUPER::new ( 1696 $class->SUPER::new (
… …
1479 ) 1699 )
1480} 1700}
1481 1701
1482############################################################################# 1702#############################################################################
1483 1703
1484package CFClient::UI::Label; 1704package CFPlus::UI::Label;
1485 1705
1486our @ISA = CFClient::UI::DrawBG::; 1706our @ISA = CFPlus::UI::DrawBG::;
1487 1707
1488use CFClient::OpenGL; 1708use CFPlus::OpenGL;
1489 1709
1490sub new { 1710sub new {
1491 my ($class, %arg) = @_; 1711 my ($class, %arg) = @_;
1492 1712
1493 my $self = $class->SUPER::new ( 1713 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1716 #active_bg => none
1497 #font => default_font 1717 #font => default_font
1498 #text => initial text 1718 #text => initial text
1499 #markup => initial narkup 1719 #markup => initial narkup
1500 #max_w => maximum pixel width 1720 #max_w => maximum pixel width
1721 #style => 0, # render flags
1501 ellipsise => 3, # end 1722 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1723 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1724 fontsize => 1,
1504 align => -1, 1725 align => -1,
1505 valign => -1, 1726 valign => -1,
1506 padding_x => 2, 1727 padding_x => 2,
1507 padding_y => 2, 1728 padding_y => 2,
1508 can_events => 0, 1729 can_events => 0,
1509 %arg 1730 %arg
1510 ); 1731 );
1511 1732
1512 if (exists $self->{template}) { 1733 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1734 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1735 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1736 $self->{template} = $layout;
1516 } 1737 }
1517 1738
1518 if (exists $self->{markup}) { 1739 if (exists $self->{markup}) {
… …
1522 } 1743 }
1523 1744
1524 $self 1745 $self
1525} 1746}
1526 1747
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1748sub update {
1538 my ($self) = @_; 1749 my ($self) = @_;
1539 1750
1540 delete $self->{texture}; 1751 delete $self->{texture};
1541 $self->SUPER::update; 1752 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1553 1764
1554 return if $self->{text} eq "T$text"; 1765 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1766 $self->{text} = "T$text";
1556 1767
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1768 $self->{layout}->set_text ($text);
1769
1559 delete $self->{req_h}; 1770 delete $self->{size_req};
1560
1561 $self->realloc; 1771 $self->realloc;
1562 $self->update; 1772 $self->update;
1563} 1773}
1564 1774
1565sub set_markup { 1775sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 1778 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1779 $self->{text} = "M$markup";
1570 1780
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1781 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1782
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1783 $self->{layout}->set_markup ($markup);
1784
1575 delete $self->{req_h}; 1785 delete $self->{size_req};
1576
1577 $self->realloc; 1786 $self->realloc;
1578 $self->update; 1787 $self->update;
1579} 1788}
1580 1789
1581sub size_request { 1790sub size_request {
1582 my ($self) = @_; 1791 my ($self) = @_;
1583 1792
1584 if (exists $self->{req_h}) { 1793 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1794 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1795 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1796 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1797 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1798 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1799
1593 my ($w, $h) = $self->{layout}->size; 1800 my ($w, $h) = $self->{layout}->size;
1594 1801
1595 if (exists $self->{template}) { 1802 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font}; 1803 $self->{template}->set_font ($self->{font}) if $self->{font};
1804 $self->{template}->set_width ($self->{max_w} || -1);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1805 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1806
1599 my ($w2, $h2) = $self->{template}->size; 1807 my ($w2, $h2) = $self->{template}->size;
1600 1808
1601 $w = List::Util::max $w, $w2; 1809 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1810 $h = List::Util::max $h, $h2;
1603 } 1811 }
1604 1812
1605 ($w, $h) 1813 [$w, $h]
1606 } 1814 };
1607}
1608 1815
1816 @{ $self->{size_req} }
1817}
1818
1819sub baseline_shift {
1820 $_[0]{layout}->descent
1821}
1822
1609sub size_allocate { 1823sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
1611 1825
1612 delete $self->{ox}; 1826 delete $self->{ox};
1613 1827
1614 delete $self->{texture} 1828 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1829 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1830
1831 1
1616} 1832}
1617 1833
1618sub set_fontsize { 1834sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1835 my ($self, $fontsize) = @_;
1620 1836
1621 $self->{fontsize} = $fontsize; 1837 $self->{fontsize} = $fontsize;
1838 delete $self->{size_req};
1622 delete $self->{texture}; 1839 delete $self->{texture};
1623 1840
1624 $self->realloc; 1841 $self->realloc;
1625} 1842}
1626 1843
1844sub reconfigure {
1845 my ($self) = @_;
1846
1847 delete $self->{size_req};
1848 delete $self->{texture};
1849
1850 $self->SUPER::reconfigure;
1851}
1852
1627sub _draw { 1853sub _draw {
1628 my ($self) = @_; 1854 my ($self) = @_;
1629 1855
1630 $self->SUPER::_draw; # draw background, if applicable 1856 $self->SUPER::_draw; # draw background, if applicable
1631 1857
1632 my $tex = $self->{texture} ||= do { 1858 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 1859 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1860 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 1861 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1862 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1863 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1864 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 1865
1640 new_from_layout CFClient::Texture $self->{layout} 1866 [$self->{layout}->size]
1641 }; 1867 };
1642 1868
1643 unless (exists $self->{ox}) { 1869 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1870 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1871 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 1872 : ($self->{w} - $size->[0]) * 0.5);
1647 1873
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1875 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 1876 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 1877 };
1652 1878
1653 glEnable GL_TEXTURE_2D; 1879 my $w = List::Util::min $self->{w} + 4, $size->[0];
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1880 my $h = List::Util::min $self->{h} + 2, $size->[1];
1655 1881
1656 glColor_premultiply @{$self->{fg}} 1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1657 if $tex->{format} == GL_ALPHA;
1658
1659 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1660
1661 glDisable GL_TEXTURE_2D;
1662} 1883}
1663 1884
1664############################################################################# 1885#############################################################################
1665 1886
1666package CFClient::UI::EntryBase; 1887package CFPlus::UI::EntryBase;
1667 1888
1668our @ISA = CFClient::UI::Label::; 1889our @ISA = CFPlus::UI::Label::;
1669 1890
1670use CFClient::OpenGL; 1891use CFPlus::OpenGL;
1671 1892
1672sub new { 1893sub new {
1673 my $class = shift; 1894 my $class = shift;
1674 1895
1675 $class->SUPER::new ( 1896 $class->SUPER::new (
… …
1680 can_hover => 1, 1901 can_hover => 1,
1681 can_focus => 1, 1902 can_focus => 1,
1682 valign => 0, 1903 valign => 0,
1683 can_events => 1, 1904 can_events => 1,
1684 #text => ... 1905 #text => ...
1906 #hidden => "*",
1685 @_ 1907 @_
1686 ) 1908 )
1687} 1909}
1688 1910
1689sub _set_text { 1911sub _set_text {
… …
1696 $self->{last_activity} = $::NOW; 1918 $self->{last_activity} = $::NOW;
1697 $self->{text} = $text; 1919 $self->{text} = $text;
1698 1920
1699 $text =~ s/./*/g if $self->{hidden}; 1921 $text =~ s/./*/g if $self->{hidden};
1700 $self->{layout}->set_text ("$text "); 1922 $self->{layout}->set_text ("$text ");
1701 delete $self->{req_h}; 1923 delete $self->{size_req};
1702 1924
1703 $self->_emit (changed => $self->{text}); 1925 $self->emit (changed => $self->{text});
1704 1926
1705 $self->realloc; 1927 $self->realloc;
1706 $self->update; 1928 $self->update;
1707} 1929}
1708 1930
… …
1723 my ($w, $h) = $self->SUPER::size_request; 1945 my ($w, $h) = $self->SUPER::size_request;
1724 1946
1725 ($w + 1, $h) # add 1 for cursor 1947 ($w + 1, $h) # add 1 for cursor
1726} 1948}
1727 1949
1728sub key_down { 1950sub invoke_key_down {
1729 my ($self, $ev) = @_; 1951 my ($self, $ev) = @_;
1730 1952
1731 my $mod = $ev->{mod}; 1953 my $mod = $ev->{mod};
1732 my $sym = $ev->{sym}; 1954 my $sym = $ev->{sym};
1733 my $uni = $ev->{unicode}; 1955 my $uni = $ev->{unicode};
… …
1736 1958
1737 if ($uni == 8) { 1959 if ($uni == 8) {
1738 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1739 } elsif ($uni == 127) { 1961 } elsif ($uni == 127) {
1740 substr $text, $self->{cursor}, 1, ""; 1962 substr $text, $self->{cursor}, 1, "";
1741 } elsif ($sym == CFClient::SDLK_LEFT) { 1963 } elsif ($sym == CFPlus::SDLK_LEFT) {
1742 --$self->{cursor} if $self->{cursor}; 1964 --$self->{cursor} if $self->{cursor};
1743 } elsif ($sym == CFClient::SDLK_RIGHT) { 1965 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1744 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1966 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1745 } elsif ($sym == CFClient::SDLK_HOME) { 1967 } elsif ($sym == CFPlus::SDLK_HOME) {
1746 $self->{cursor} = 0; 1968 $self->{cursor} = 0;
1747 } elsif ($sym == CFClient::SDLK_END) { 1969 } elsif ($sym == CFPlus::SDLK_END) {
1748 $self->{cursor} = length $text; 1970 $self->{cursor} = length $text;
1971 } elsif ($uni == 21) { # ctrl-u
1972 $text = "";
1973 $self->{cursor} = 0;
1749 } elsif ($uni == 27) { 1974 } elsif ($uni == 27) {
1750 $self->_emit ('escape'); 1975 $self->emit ('escape');
1751 } elsif ($uni) { 1976 } elsif ($uni) {
1752 substr $text, $self->{cursor}++, 0, chr $uni; 1977 substr $text, $self->{cursor}++, 0, chr $uni;
1753 } else { 1978 } else {
1754 return 0; 1979 return 0;
1755 } 1980 }
… …
1759 $self->realloc; 1984 $self->realloc;
1760 1985
1761 1 1986 1
1762} 1987}
1763 1988
1764sub focus_in { 1989sub invoke_focus_in {
1765 my ($self) = @_; 1990 my ($self) = @_;
1766 1991
1767 $self->{last_activity} = $::NOW; 1992 $self->{last_activity} = $::NOW;
1768 1993
1769 $self->SUPER::focus_in; 1994 $self->SUPER::invoke_focus_in
1770} 1995}
1771 1996
1772sub button_down { 1997sub invoke_button_down {
1773 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1774 1999
1775 $self->SUPER::button_down ($ev, $x, $y); 2000 $self->SUPER::invoke_button_down ($ev, $x, $y);
1776 2001
1777 my $idx = $self->{layout}->xy_to_index ($x, $y); 2002 my $idx = $self->{layout}->xy_to_index ($x, $y);
1778 2003
1779 # byte-index to char-index 2004 # byte-index to char-index
1780 my $text = $self->{text}; 2005 my $text = $self->{text};
1781 utf8::encode $text; 2006 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1782 $self->{cursor} = length substr $text, 0, $idx; 2007 $self->{cursor} = length $text;
1783 2008
1784 $self->_set_text ($self->{text}); 2009 $self->_set_text ($self->{text});
1785 $self->update; 2010 $self->update;
1786 2011
1787 1 2012 1
1788} 2013}
1789 2014
1790sub mouse_motion { 2015sub invoke_mouse_motion {
1791 my ($self, $ev, $x, $y) = @_; 2016 my ($self, $ev, $x, $y) = @_;
1792# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2017# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1793 2018
1794 0 2019 1
1795} 2020}
1796 2021
1797sub _draw { 2022sub _draw {
1798 my ($self) = @_; 2023 my ($self) = @_;
1799 2024
… …
1826 utf8::encode $text; 2051 utf8::encode $text;
1827 2052
1828 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2053 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1829 } 2054 }
1830 2055
1831 glColor @{$self->{fg}};
1832 glBegin GL_LINES; 2056 glBegin GL_LINES;
1833 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2057 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1834 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1835 glEnd; 2059 glEnd;
1836 } 2060 }
1837} 2061}
1838 2062
1839package CFClient::UI::Entry; 2063package CFPlus::UI::Entry;
1840 2064
1841our @ISA = CFClient::UI::EntryBase::; 2065our @ISA = CFPlus::UI::EntryBase::;
1842 2066
1843use CFClient::OpenGL; 2067use CFPlus::OpenGL;
1844 2068
1845sub key_down { 2069sub invoke_key_down {
1846 my ($self, $ev) = @_; 2070 my ($self, $ev) = @_;
1847 2071
1848 my $sym = $ev->{sym}; 2072 my $sym = $ev->{sym};
1849 2073
1850 if ($sym == 13) { 2074 if ($sym == 13) {
1851 unshift @{$self->{history}}, 2075 unshift @{$self->{history}},
1852 my $txt = $self->get_text; 2076 my $txt = $self->get_text;
2077
1853 $self->{history_pointer} = -1; 2078 $self->{history_pointer} = -1;
1854 $self->{history_saveback} = ''; 2079 $self->{history_saveback} = '';
1855 $self->_emit (activate => $txt); 2080 $self->emit (activate => $txt);
1856 $self->update; 2081 $self->update;
1857 2082
1858 } elsif ($sym == CFClient::SDLK_UP) { 2083 } elsif ($sym == CFPlus::SDLK_UP) {
1859 if ($self->{history_pointer} < 0) { 2084 if ($self->{history_pointer} < 0) {
1860 $self->{history_saveback} = $self->get_text; 2085 $self->{history_saveback} = $self->get_text;
1861 } 2086 }
1862 if (@{$self->{history} || []} > 0) { 2087 if (@{$self->{history} || []} > 0) {
1863 $self->{history_pointer}++; 2088 $self->{history_pointer}++;
… …
1865 $self->{history_pointer} = @{$self->{history} || []} - 1; 2090 $self->{history_pointer} = @{$self->{history} || []} - 1;
1866 } 2091 }
1867 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2092 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1868 } 2093 }
1869 2094
1870 } elsif ($sym == CFClient::SDLK_DOWN) { 2095 } elsif ($sym == CFPlus::SDLK_DOWN) {
1871 $self->{history_pointer}--; 2096 $self->{history_pointer}--;
1872 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2097 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1873 2098
1874 if ($self->{history_pointer} >= 0) { 2099 if ($self->{history_pointer} >= 0) {
1875 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2100 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1876 } else { 2101 } else {
1877 $self->set_text ($self->{history_saveback}); 2102 $self->set_text ($self->{history_saveback});
1878 } 2103 }
1879 2104
1880 } else { 2105 } else {
1881 return $self->SUPER::key_down ($ev) 2106 return $self->SUPER::invoke_key_down ($ev)
1882 } 2107 }
1883 2108
1884 1 2109 1
1885} 2110}
1886 2111
1887############################################################################# 2112#############################################################################
1888 2113
1889package CFClient::UI::Button; 2114package CFPlus::UI::Button;
1890 2115
1891our @ISA = CFClient::UI::Label::; 2116our @ISA = CFPlus::UI::Label::;
1892 2117
1893use CFClient::OpenGL; 2118use CFPlus::OpenGL;
1894 2119
1895my @tex = 2120my @tex =
1896 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2121 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1897 qw(b1_button_active.png); 2122 qw(b1_button_active.png);
1898 2123
1899sub new { 2124sub new {
1900 my $class = shift; 2125 my $class = shift;
1901 2126
… …
1910 can_events => 1, 2135 can_events => 1,
1911 @_ 2136 @_
1912 ) 2137 )
1913} 2138}
1914 2139
1915sub activate { }
1916
1917sub button_up { 2140sub invoke_button_up {
1918 my ($self, $ev, $x, $y) = @_; 2141 my ($self, $ev, $x, $y) = @_;
1919 2142
1920 $self->emit ("activate") 2143 $self->emit ("activate")
1921 if $x >= 0 && $x < $self->{w} 2144 if $x >= 0 && $x < $self->{w}
1922 && $y >= 0 && $y < $self->{h}; 2145 && $y >= 0 && $y < $self->{h};
… …
1940 $self->SUPER::_draw; 2163 $self->SUPER::_draw;
1941} 2164}
1942 2165
1943############################################################################# 2166#############################################################################
1944 2167
1945package CFClient::UI::CheckBox; 2168package CFPlus::UI::CheckBox;
1946 2169
1947our @ISA = CFClient::UI::DrawBG::; 2170our @ISA = CFPlus::UI::DrawBG::;
1948 2171
1949my @tex = 2172my @tex =
1950 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2173 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2174 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1952 2175
1953use CFClient::OpenGL; 2176use CFPlus::OpenGL;
1954 2177
1955sub new { 2178sub new {
1956 my $class = shift; 2179 my $class = shift;
1957 2180
1958 $class->SUPER::new ( 2181 $class->SUPER::new (
… …
1972 my ($self) = @_; 2195 my ($self) = @_;
1973 2196
1974 (6) x 2 2197 (6) x 2
1975} 2198}
1976 2199
2200sub toggle {
2201 my ($self) = @_;
2202
2203 $self->{state} = !$self->{state};
2204 $self->emit (changed => $self->{state});
2205 $self->update;
2206}
2207
1977sub button_down { 2208sub invoke_button_down {
1978 my ($self, $ev, $x, $y) = @_; 2209 my ($self, $ev, $x, $y) = @_;
1979 2210
1980 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2211 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1981 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2212 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1982 $self->{state} = !$self->{state}; 2213 $self->toggle;
1983 $self->_emit (changed => $self->{state});
1984 } else { 2214 } else {
1985 return 0 2215 return 0
1986 } 2216 }
1987 2217
1988 1 2218 1
… …
2008 glDisable GL_TEXTURE_2D; 2238 glDisable GL_TEXTURE_2D;
2009} 2239}
2010 2240
2011############################################################################# 2241#############################################################################
2012 2242
2013package CFClient::UI::Image; 2243package CFPlus::UI::Image;
2014 2244
2015our @ISA = CFClient::UI::Base::; 2245our @ISA = CFPlus::UI::Base::;
2016 2246
2017use CFClient::OpenGL; 2247use CFPlus::OpenGL;
2018use Carp qw/confess/;
2019 2248
2020our %loaded_images; 2249our %texture_cache;
2021 2250
2022sub new { 2251sub new {
2023 my $class = shift; 2252 my $class = shift;
2024 2253
2025 my $self = $class->SUPER::new (can_events => 0, @_); 2254 my $self = $class->SUPER::new (
2255 can_events => 0,
2256 @_,
2257 );
2026 2258
2027 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2259 $self->{path} || $self->{tex}
2260 or Carp::croak "'path' or 'tex' attributes required";
2028 2261
2029 $loaded_images{$self->{image}} ||= 2262 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2030 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2031 2264
2032 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2265 Scalar::Util::weaken $texture_cache{$self->{path}};
2033 2266
2034 Scalar::Util::weaken $loaded_images{$self->{image}}; 2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2035
2036 $self->{aspect} = $tex->{w} / $tex->{h};
2037 2268
2038 $self 2269 $self
2039} 2270}
2040 2271
2272sub STORABLE_freeze {
2273 my ($self, $cloning) = @_;
2274
2275 $self->{path}
2276 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2277
2278 $self->{path}
2279}
2280
2281sub STORABLE_attach {
2282 my ($self, $cloning, $path) = @_;
2283
2284 $self->new (path => $path)
2285}
2286
2041sub size_request { 2287sub size_request {
2042 my ($self) = @_; 2288 my ($self) = @_;
2043 2289
2044 ($self->{tex}->{w}, $self->{tex}->{h}) 2290 ($self->{tex}{w}, $self->{tex}{h})
2045} 2291}
2046 2292
2047sub _draw { 2293sub _draw {
2048 my ($self) = @_; 2294 my ($self) = @_;
2049 2295
… …
2059 } 2305 }
2060 2306
2061 glEnable GL_TEXTURE_2D; 2307 glEnable GL_TEXTURE_2D;
2062 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2308 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2063 2309
2064 $tex->draw_quad_alpha (0, 0, $w, $h); 2310 $tex->draw_quad (0, 0, $w, $h);
2065 2311
2066 glDisable GL_TEXTURE_2D; 2312 glDisable GL_TEXTURE_2D;
2067} 2313}
2068 2314
2069############################################################################# 2315#############################################################################
2070 2316
2317package CFPlus::UI::ImageButton;
2318
2319our @ISA = CFPlus::UI::Image::;
2320
2321use CFPlus::OpenGL;
2322
2323my %textures;
2324
2325sub new {
2326 my $class = shift;
2327
2328 my $self = $class->SUPER::new (
2329 padding_x => 4,
2330 padding_y => 4,
2331 fg => [1, 1, 1],
2332 active_fg => [0, 0, 1],
2333 can_hover => 1,
2334 align => 0,
2335 valign => 0,
2336 can_events => 1,
2337 @_
2338 );
2339}
2340
2341sub invoke_button_up {
2342 my ($self, $ev, $x, $y) = @_;
2343
2344 $self->emit ("activate")
2345 if $x >= 0 && $x < $self->{w}
2346 && $y >= 0 && $y < $self->{h};
2347
2348 1
2349}
2350
2351#############################################################################
2352
2071package CFClient::UI::VGauge; 2353package CFPlus::UI::VGauge;
2072 2354
2073our @ISA = CFClient::UI::Base::; 2355our @ISA = CFPlus::UI::Base::;
2074 2356
2075use List::Util qw(min max); 2357use List::Util qw(min max);
2076 2358
2077use CFClient::OpenGL; 2359use CFPlus::OpenGL;
2078 2360
2079my %tex = ( 2361my %tex = (
2080 food => [ 2362 food => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2364 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2083 ], 2365 ],
2084 grace => [ 2366 grace => [
2085 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2086 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2368 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2087 ], 2369 ],
2088 hp => [ 2370 hp => [
2089 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2090 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2372 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2091 ], 2373 ],
2092 mana => [ 2374 mana => [
2093 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2375 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2094 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2376 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2095 ], 2377 ],
2096); 2378);
2097 2379
2098# eg. VGauge->new (gauge => 'food'), default gauge: food 2380# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2158 my $ycut1 = max 0, min 1, $ycut; 2440 my $ycut1 = max 0, min 1, $ycut;
2159 my $ycut2 = max 0, min 1, $ycut - 1; 2441 my $ycut2 = max 0, min 1, $ycut - 1;
2160 2442
2161 my $h1 = $self->{h} * (1 - $ycut1); 2443 my $h1 = $self->{h} * (1 - $ycut1);
2162 my $h2 = $self->{h} * (1 - $ycut2); 2444 my $h2 = $self->{h} * (1 - $ycut2);
2445 my $h3 = $self->{h};
2446
2447 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2163 2448
2164 glEnable GL_BLEND; 2449 glEnable GL_BLEND;
2165 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2450 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2166 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2451 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2167 glEnable GL_TEXTURE_2D; 2452 glEnable GL_TEXTURE_2D;
… …
2186 2471
2187 if ($t3) { 2472 if ($t3) {
2188 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2473 glBindTexture GL_TEXTURE_2D, $t3->{name};
2189 glBegin GL_QUADS; 2474 glBegin GL_QUADS;
2190 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2475 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2191 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2476 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2192 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2477 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2193 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2478 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2194 glEnd; 2479 glEnd;
2195 } 2480 }
2196 2481
2197 glDisable GL_BLEND; 2482 glDisable GL_BLEND;
2198 glDisable GL_TEXTURE_2D; 2483 glDisable GL_TEXTURE_2D;
2199} 2484}
2200 2485
2201############################################################################# 2486#############################################################################
2202 2487
2203package CFClient::UI::Gauge; 2488package CFPlus::UI::Gauge;
2204 2489
2205our @ISA = CFClient::UI::VBox::; 2490our @ISA = CFPlus::UI::VBox::;
2206 2491
2207sub new { 2492sub new {
2208 my ($class, %arg) = @_; 2493 my ($class, %arg) = @_;
2209 2494
2210 my $self = $class->SUPER::new ( 2495 my $self = $class->SUPER::new (
… …
2212 can_hover => 1, 2497 can_hover => 1,
2213 can_events => 1, 2498 can_events => 1,
2214 %arg, 2499 %arg,
2215 ); 2500 );
2216 2501
2217 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2502 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2218 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2503 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2219 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2504 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2220 2505
2221 $self 2506 $self
2222} 2507}
2223 2508
2224sub set_fontsize { 2509sub set_fontsize {
… …
2245 $self->{value}->set_text ($val); 2530 $self->{value}->set_text ($val);
2246} 2531}
2247 2532
2248############################################################################# 2533#############################################################################
2249 2534
2250package CFClient::UI::Slider; 2535package CFPlus::UI::Slider;
2251 2536
2252use strict; 2537use strict;
2253 2538
2254use CFClient::OpenGL; 2539use CFPlus::OpenGL;
2255 2540
2256our @ISA = CFClient::UI::DrawBG::; 2541our @ISA = CFPlus::UI::DrawBG::;
2257 2542
2258my @tex = 2543my @tex =
2259 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2544 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2260 qw(s1_slider.png s1_slider_bg.png); 2545 qw(s1_slider.png s1_slider_bg.png);
2261 2546
2262sub new { 2547sub new {
2263 my $class = shift; 2548 my $class = shift;
2264 2549
… …
2285 $self->update; 2570 $self->update;
2286 2571
2287 $self 2572 $self
2288} 2573}
2289 2574
2290sub changed { }
2291
2292sub set_range { 2575sub set_range {
2293 my ($self, $range) = @_; 2576 my ($self, $range) = @_;
2294 2577
2295 ($range, $self->{range}) = ($self->{range}, $range); 2578 ($range, $self->{range}) = ($self->{range}, $range);
2296 2579
2297 $self->update
2298 if "@$range" ne "@{$self->{range}}"; 2580 if ("@$range" ne "@{$self->{range}}") {
2581 $self->update;
2582 $self->set_value ($self->{range}[0]);
2583 }
2299} 2584}
2300 2585
2301sub set_value { 2586sub set_value {
2302 my ($self, $value) = @_; 2587 my ($self, $value) = @_;
2303 2588
… …
2314 if $unit; 2599 if $unit;
2315 2600
2316 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2601 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2317 2602
2318 if ($value != $old_value) { 2603 if ($value != $old_value) {
2319 $self->_emit (changed => $value); 2604 $self->emit (changed => $value);
2320 $self->update; 2605 $self->update;
2321 } 2606 }
2322} 2607}
2323 2608
2324sub size_request { 2609sub size_request {
2325 my ($self) = @_; 2610 my ($self) = @_;
2326 2611
2327 ($self->{req_w}, $self->{req_h}) 2612 ($self->{req_w}, $self->{req_h})
2328} 2613}
2329 2614
2330sub button_down { 2615sub invoke_button_down {
2331 my ($self, $ev, $x, $y) = @_; 2616 my ($self, $ev, $x, $y) = @_;
2332 2617
2333 $self->SUPER::button_down ($ev, $x, $y); 2618 $self->SUPER::invoke_button_down ($ev, $x, $y);
2334 2619
2335 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2620 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2336 2621
2337 $self->mouse_motion ($ev, $x, $y) 2622 $self->invoke_mouse_motion ($ev, $x, $y)
2338} 2623}
2339 2624
2340sub mouse_motion { 2625sub invoke_mouse_motion {
2341 my ($self, $ev, $x, $y) = @_; 2626 my ($self, $ev, $x, $y) = @_;
2342 2627
2343 if ($GRAB == $self) { 2628 if ($GRAB == $self) {
2344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2629 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2345 2630
… …
2351 } else { 2636 } else {
2352 return 0; 2637 return 0;
2353 } 2638 }
2354 2639
2355 1 2640 1
2641}
2642
2643sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_;
2645
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2649
2650 ! ! $delta
2356} 2651}
2357 2652
2358sub update { 2653sub update {
2359 my ($self) = @_; 2654 my ($self) = @_;
2360 2655
… …
2409 glDisable GL_TEXTURE_2D; 2704 glDisable GL_TEXTURE_2D;
2410} 2705}
2411 2706
2412############################################################################# 2707#############################################################################
2413 2708
2414package CFClient::UI::ValSlider; 2709package CFPlus::UI::ValSlider;
2415 2710
2416our @ISA = CFClient::UI::HBox::; 2711our @ISA = CFPlus::UI::HBox::;
2417 2712
2418sub new { 2713sub new {
2419 my ($class, %arg) = @_; 2714 my ($class, %arg) = @_;
2420 2715
2421 my $range = delete $arg{range}; 2716 my $range = delete $arg{range};
2422 2717
2423 my $self = $class->SUPER::new ( 2718 my $self = $class->SUPER::new (
2424 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2719 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2425 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2720 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2426 to_value => sub { shift }, 2721 to_value => sub { shift },
2427 from_value => sub { shift }, 2722 from_value => sub { shift },
2428 %arg, 2723 %arg,
2429 ); 2724 );
2430 2725
… …
2450sub set_range { shift->{slider}->set_range (@_) } 2745sub set_range { shift->{slider}->set_range (@_) }
2451sub set_value { shift->{slider}->set_value (@_) } 2746sub set_value { shift->{slider}->set_value (@_) }
2452 2747
2453############################################################################# 2748#############################################################################
2454 2749
2455package CFClient::UI::TextView; 2750package CFPlus::UI::TextScroller;
2456 2751
2457our @ISA = CFClient::UI::HBox::; 2752our @ISA = CFPlus::UI::HBox::;
2458 2753
2459use CFClient::OpenGL; 2754use CFPlus::OpenGL;
2460 2755
2461sub new { 2756sub new {
2462 my $class = shift; 2757 my $class = shift;
2463 2758
2464 my $self = $class->SUPER::new ( 2759 my $self = $class->SUPER::new (
2465 fontsize => 1, 2760 fontsize => 1,
2466 can_events => 0, 2761 can_events => 1,
2762 indent => 0,
2467 #font => default_font 2763 #font => default_font
2468 @_, 2764 @_,
2469 2765
2470 layout => (new CFClient::Layout 1), 2766 layout => (new CFPlus::Layout),
2471 par => [], 2767 par => [],
2472 height => 0, 2768 height => 0,
2473 children => [ 2769 children => [
2474 (new CFClient::UI::Empty expand => 1), 2770 (new CFPlus::UI::Empty expand => 1),
2475 (new CFClient::UI::Slider vertical => 1), 2771 (new CFPlus::UI::Slider vertical => 1),
2476 ], 2772 ],
2477 ); 2773 );
2478 2774
2479 $self->{children}[1]->connect (changed => sub { $self->update }); 2775 $self->{children}[1]->connect (changed => sub { $self->update });
2480 2776
… …
2486 2782
2487 $self->{fontsize} = $fontsize; 2783 $self->{fontsize} = $fontsize;
2488 $self->reflow; 2784 $self->reflow;
2489} 2785}
2490 2786
2787sub size_request {
2788 my ($self) = @_;
2789
2790 my ($empty, $slider) = @{ $self->{children} };
2791
2792 local $self->{children} = [$empty, $slider];
2793 $self->SUPER::size_request
2794}
2795
2491sub size_allocate { 2796sub invoke_size_allocate {
2492 my ($self, $w, $h) = @_; 2797 my ($self, $w, $h) = @_;
2493 2798
2494 $self->SUPER::size_allocate ($w, $h); 2799 my ($empty, $slider, @other) = @{ $self->{children} };
2800 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2495 2801
2496 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2802 $self->{layout}->set_font ($self->{font}) if $self->{font};
2497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2803 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $self->{layout}->set_width ($self->{children}[0]{w}); 2804 $self->{layout}->set_width ($empty->{w});
2805 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499 2806
2500 $self->reflow; 2807 $self->reflow;
2501}
2502 2808
2503sub text_size { 2809 local $self->{children} = [$empty, $slider];
2810 $self->SUPER::invoke_size_allocate ($w, $h)
2811}
2812
2813sub invoke_mouse_wheel {
2504 my ($self, $text, $indent) = @_; 2814 my ($self, $ev) = @_;
2815
2816 return 0 unless $ev->{dy}; # only vertical movements
2817
2818 $self->{children}[1]->emit (mouse_wheel => $ev);
2819
2820 1
2821}
2822
2823sub get_layout {
2824 my ($self, $para) = @_;
2505 2825
2506 my $layout = $self->{layout}; 2826 my $layout = $self->{layout};
2507 2827
2828 $layout->set_font ($self->{font}) if $self->{font};
2829 $layout->set_foreground (@{$para->{fg}});
2508 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2830 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $layout->set_width ($self->{children}[0]{w} - $indent); 2831 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2832 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 $layout->set_markup ($text); 2833 $layout->set_markup ($para->{markup});
2834
2835 $layout->set_shapes (
2836 map
2837 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2838 @{$para->{widget}}
2511 2839 );
2840
2512 $layout->size 2841 $layout
2513} 2842}
2514 2843
2515sub reflow { 2844sub reflow {
2516 my ($self) = @_; 2845 my ($self) = @_;
2517 2846
… …
2524 2853
2525 # todo: base offset on lines or so, not on pixels 2854 # todo: base offset on lines or so, not on pixels
2526 $self->{children}[1]->set_value ($offset); 2855 $self->{children}[1]->set_value ($offset);
2527} 2856}
2528 2857
2858sub current_paragraph {
2859 my ($self) = @_;
2860
2861 $self->{top_paragraph} - 1
2862}
2863
2864sub scroll_to {
2865 my ($self, $para) = @_;
2866
2867 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2868
2869 $self->{scroll_to} = $para;
2870 $self->update;
2871}
2872
2529sub clear { 2873sub clear {
2530 my ($self) = @_; 2874 my ($self) = @_;
2875
2876 my (undef, undef, @other) = @{ $self->{children} };
2877 $self->remove ($_) for @other;
2531 2878
2532 $self->{par} = []; 2879 $self->{par} = [];
2533 $self->{height} = 0; 2880 $self->{height} = 0;
2534 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2881 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2535} 2882}
2536 2883
2537sub add_paragraph { 2884sub add_paragraph {
2538 my ($self, $color, $text, $indent) = @_; 2885 my $self = shift;
2539 2886
2540 for my $line (split /\n/, $text) { 2887 for my $para (@_) {
2541 my ($w, $h) = $self->text_size ($line); 2888 $para = {
2889 fg => [1, 1, 1, 1],
2890 indent => 0,
2891 markup => "",
2892 widget => [],
2893 ref $para ? %$para : (markup => $para),
2894 w => 1e10,
2895 wrapped => 1,
2896 };
2897
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para;
2900 }
2901
2902 $self->{need_reflow}++;
2903 $self->update;
2904}
2905
2906sub scroll_to_bottom {
2907 my ($self) = @_;
2908
2909 $self->{scroll_to} = $#{$self->{par}};
2910 $self->update;
2911}
2912
2913sub force_uptodate {
2914 my ($self) = @_;
2915
2916 if (delete $self->{need_reflow}) {
2917 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2918
2919 my $height = 0;
2920
2921 for my $para (@{$self->{par}}) {
2922 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2923 my $layout = $self->get_layout ($para);
2924 my ($w, $h) = $layout->size;
2925
2926 $para->{w} = $w + $para->{indent};
2927 $para->{h} = $h;
2928 $para->{wrapped} = $layout->has_wrapped;
2929 }
2930
2931 $para->{y} = $height;
2932 $height += $para->{h};
2933 }
2934
2542 $self->{height} += $h; 2935 $self->{height} = $height;
2543 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2936 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2544 }
2545 2937
2546 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2938 delete $self->{texture};
2939 }
2940
2941 if (my $paridx = delete $self->{scroll_to}) {
2942 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2943 }
2547} 2944}
2548 2945
2549sub update { 2946sub update {
2550 my ($self) = @_; 2947 my ($self) = @_;
2551 2948
… …
2553 2950
2554 return unless $self->{h} > 0; 2951 return unless $self->{h} > 0;
2555 2952
2556 delete $self->{texture}; 2953 delete $self->{texture};
2557 2954
2558 $ROOT->on_post_alloc ($self, sub { 2955 $ROOT->on_post_alloc ($self => sub {
2956 $self->force_uptodate;
2957
2559 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2958 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2560 2959
2561 if (delete $self->{need_reflow}) {
2562 my $height = 0;
2563
2564 my $layout = $self->{layout};
2565
2566 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2567
2568 for (@{$self->{par}}) {
2569 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2570 $layout->set_width ($W - $_->[3]);
2571 $layout->set_markup ($_->[4]);
2572 my ($w, $h) = $layout->size;
2573 $_->[0] = $w + $_->[3];
2574 $_->[1] = $h;
2575 }
2576
2577 $height += $_->[1];
2578 }
2579
2580 $self->{height} = $height;
2581
2582 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2583
2584 delete $self->{texture};
2585 }
2586
2587 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2960 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2588 glClearColor 0, 0, 0, 0; 2961 glClearColor 0, 0, 0, 0;
2589 glClear GL_COLOR_BUFFER_BIT; 2962 glClear GL_COLOR_BUFFER_BIT;
2590 2963
2964 package CFPlus::UI::Base;
2965 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2966 (0, 0, $self->{w}, $self->{h});
2967
2968 my $top = int $self->{children}[1]{range}[0];
2969
2970 my $paridx = 0;
2971 my $top_paragraph;
2591 my $top = int $self->{children}[1]{range}[0]; 2972 my $top = int $self->{children}[1]{range}[0];
2592 2973
2593 my $y0 = $top; 2974 my $y0 = $top;
2594 my $y1 = $top + $H; 2975 my $y1 = $top + $H;
2595 2976
2596 my $y = 0;
2597
2598 my $layout = $self->{layout};
2599
2600 $layout->set_font ($self->{font}) if $self->{font};
2601
2602 glEnable GL_BLEND;
2603 #TODO# not correct in windows where rgba is forced off
2604 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2605
2606 for my $par (@{$self->{par}}) { 2977 for my $para (@{$self->{par}}) {
2607 my $h = $par->[1]; 2978 my $h = $para->{h};
2979 my $y = $para->{y};
2608 2980
2609 if ($y0 < $y + $h && $y < $y1) { 2981 if ($y0 < $y + $h && $y < $y1) {
2610 $layout->set_foreground (@{ $par->[2] }); 2982 my $layout = $self->get_layout ($para);
2611 $layout->set_width ($W - $par->[3]);
2612 $layout->set_markup ($par->[4]);
2613 2983
2614 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2984 $layout->render ($para->{indent}, $y - $y0);
2615 2985
2616 glRasterPos $par->[3], $y - $y0; 2986 if (my @w = @{ $para->{widget} }) {
2617 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2987 my @s = $layout->get_shapes;
2988
2989 for (@w) {
2990 my ($dx, $dy) = splice @s, 0, 2, ();
2991
2992 $_->{x} = $dx + $para->{indent};
2993 $_->{y} = $dy + $y - $y0;
2994
2995 $_->draw;
2996 }
2997 }
2618 } 2998 }
2619 2999
2620 $y += $h; 3000 $paridx++;
3001 $top_paragraph ||= $paridx if $y >= $top;
2621 } 3002 }
2622 3003
2623 glDisable GL_BLEND; 3004 $self->{top_paragraph} = $top_paragraph;
2624 }; 3005 };
2625 }); 3006 });
3007}
3008
3009sub reconfigure {
3010 my ($self) = @_;
3011
3012 $self->SUPER::reconfigure;
3013
3014 $_->{w} = 1e10 for @{ $self->{par} };
3015 $self->reflow;
2626} 3016}
2627 3017
2628sub _draw { 3018sub _draw {
2629 my ($self) = @_; 3019 my ($self) = @_;
2630 3020
… …
2633 glColor 0, 0, 0, 1; 3023 glColor 0, 0, 0, 1;
2634 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3024 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2635 glDisable GL_TEXTURE_2D; 3025 glDisable GL_TEXTURE_2D;
2636 3026
2637 $self->{children}[1]->draw; 3027 $self->{children}[1]->draw;
2638
2639} 3028}
2640 3029
2641############################################################################# 3030#############################################################################
2642 3031
2643package CFClient::UI::Animator; 3032package CFPlus::UI::Animator;
2644 3033
2645use CFClient::OpenGL; 3034use CFPlus::OpenGL;
2646 3035
2647our @ISA = CFClient::UI::Bin::; 3036our @ISA = CFPlus::UI::Bin::;
2648 3037
2649sub moveto { 3038sub moveto {
2650 my ($self, $x, $y) = @_; 3039 my ($self, $x, $y) = @_;
2651 3040
2652 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3041 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2680 glPopMatrix; 3069 glPopMatrix;
2681} 3070}
2682 3071
2683############################################################################# 3072#############################################################################
2684 3073
2685package CFClient::UI::Flopper; 3074package CFPlus::UI::Flopper;
2686 3075
2687our @ISA = CFClient::UI::Button::; 3076our @ISA = CFPlus::UI::Button::;
2688 3077
2689sub new { 3078sub new {
2690 my $class = shift; 3079 my $class = shift;
2691 3080
2692 my $self = $class->SUPER::new ( 3081 my $self = $class->SUPER::new (
… …
2704 $self->{other}->toggle_visibility; 3093 $self->{other}->toggle_visibility;
2705} 3094}
2706 3095
2707############################################################################# 3096#############################################################################
2708 3097
2709package CFClient::UI::Tooltip; 3098package CFPlus::UI::Tooltip;
2710 3099
2711our @ISA = CFClient::UI::Bin::; 3100our @ISA = CFPlus::UI::Bin::;
2712 3101
2713use CFClient::OpenGL; 3102use CFPlus::OpenGL;
2714 3103
2715sub new { 3104sub new {
2716 my $class = shift; 3105 my $class = shift;
2717 3106
2718 $class->SUPER::new ( 3107 $class->SUPER::new (
… …
2721 ) 3110 )
2722} 3111}
2723 3112
2724sub set_tooltip_from { 3113sub set_tooltip_from {
2725 my ($self, $widget) = @_; 3114 my ($self, $widget) = @_;
3115
3116 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3117 if $widget->{tooltip} =~ /^#(.*)$/;
2726 3118
2727 my $tooltip = $widget->{tooltip}; 3119 my $tooltip = $widget->{tooltip};
2728 3120
2729 if ($ENV{CFPLUS_DEBUG} & 2) { 3121 if ($ENV{CFPLUS_DEBUG} & 2) {
2730 $tooltip .= "\n\n" . (ref $widget) . "\n" 3122 $tooltip .= "\n\n" . (ref $widget) . "\n"
2731 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3123 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2732 . "req $widget->{req_w} $widget->{req_h}\n" 3124 . "req $widget->{req_w} $widget->{req_h}\n"
2733 . "visible $widget->{visible}"; 3125 . "visible $widget->{visible}";
2734 } 3126 }
2735 3127
3128 $tooltip =~ s/^\n+//;
3129 $tooltip =~ s/\n+$//;
3130
2736 $self->add (new CFClient::UI::Label 3131 $self->add (new CFPlus::UI::Label
2737 markup => $tooltip, 3132 markup => $tooltip,
2738 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3133 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2739 fontsize => 0.8, 3134 fontsize => 0.8,
2740 fg => [0, 0, 0, 1], 3135 style => 1, # FLAG_INVERSE
2741 ellipsise => 0, 3136 ellipsise => 0,
2742 font => ($widget->{tooltip_font} || $::FONT_PROP), 3137 font => ($widget->{tooltip_font} || $::FONT_PROP),
2743 ); 3138 );
2744} 3139}
2745 3140
… …
2749 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3144 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2750 3145
2751 ($w + 4, $h + 4) 3146 ($w + 4, $h + 4)
2752} 3147}
2753 3148
2754sub size_allocate { 3149sub invoke_size_allocate {
2755 my ($self, $w, $h) = @_; 3150 my ($self, $w, $h) = @_;
2756 3151
2757 $self->SUPER::size_allocate ($w - 4, $h - 4); 3152 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2758} 3153}
2759 3154
2760sub visibility_change { 3155sub invoke_visibility_change {
2761 my ($self, $visible) = @_; 3156 my ($self, $visible) = @_;
2762 3157
2763 return unless $visible; 3158 return unless $visible;
2764 3159
2765 $self->{root}->on_post_alloc ("move_$self" => sub { 3160 $self->{root}->on_post_alloc ("move_$self" => sub {
2766 my $widget = $self->{owner} 3161 my $widget = $self->{owner}
2767 or return; 3162 or return;
2768 3163
3164 if ($widget->{visible}) {
2769 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3165 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2770 3166
2771 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3167 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2772 if $x + $self->{w} > $::WIDTH; 3168 if $x + $self->{w} > $self->{root}{w};
2773 3169
2774 $self->move_abs ($x, $y); 3170 $self->move_abs ($x, $y);
3171 } else {
3172 $self->hide;
3173 }
2775 }); 3174 });
2776} 3175}
2777 3176
2778sub _draw { 3177sub _draw {
2779 my ($self) = @_; 3178 my ($self) = @_;
… …
2803 $self->SUPER::_draw; 3202 $self->SUPER::_draw;
2804} 3203}
2805 3204
2806############################################################################# 3205#############################################################################
2807 3206
2808package CFClient::UI::Face; 3207package CFPlus::UI::Face;
2809 3208
2810our @ISA = CFClient::UI::Base::; 3209our @ISA = CFPlus::UI::DrawBG::;
2811 3210
2812use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2813 3212
2814sub new { 3213sub new {
2815 my $class = shift; 3214 my $class = shift;
2816 3215
2817 my $self = $class->SUPER::new ( 3216 my $self = $class->SUPER::new (
… …
2852sub _draw { 3251sub _draw {
2853 my ($self) = @_; 3252 my ($self) = @_;
2854 3253
2855 return unless $::CONN; 3254 return unless $::CONN;
2856 3255
3256 $self->SUPER::_draw;
3257
2857 my $face; 3258 my $face;
2858 3259
2859 if ($self->{frame}) { 3260 if ($self->{frame}) {
2860 my $anim = $::CONN->{anim}[$self->{anim}]; 3261 my $anim = $::CONN->{anim}[$self->{anim}];
2861 3262
… …
2872 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3273 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2873 glDisable GL_TEXTURE_2D; 3274 glDisable GL_TEXTURE_2D;
2874 } 3275 }
2875} 3276}
2876 3277
2877sub DESTROY { 3278sub destroy {
2878 my ($self) = @_; 3279 my ($self) = @_;
2879 3280
2880 $self->{timer}->cancel 3281 $self->{timer}->cancel
2881 if $self->{timer}; 3282 if $self->{timer};
2882 3283
2883 $self->SUPER::DESTROY; 3284 $self->SUPER::destroy;
2884} 3285}
2885 3286
2886############################################################################# 3287#############################################################################
2887 3288
2888package CFClient::UI::Buttonbar; 3289package CFPlus::UI::Buttonbar;
2889 3290
2890our @ISA = CFClient::UI::HBox::; 3291our @ISA = CFPlus::UI::HBox::;
2891 3292
2892# TODO: should actualyl wrap buttons and other goodies. 3293# TODO: should actually wrap buttons and other goodies.
2893 3294
2894############################################################################# 3295#############################################################################
2895 3296
2896package CFClient::UI::Menu; 3297package CFPlus::UI::Menu;
2897 3298
2898our @ISA = CFClient::UI::FancyFrame::; 3299our @ISA = CFPlus::UI::Toplevel::;
2899 3300
2900use CFClient::OpenGL; 3301use CFPlus::OpenGL;
2901 3302
2902sub new { 3303sub new {
2903 my $class = shift; 3304 my $class = shift;
2904 3305
2905 my $self = $class->SUPER::new ( 3306 my $self = $class->SUPER::new (
2906 items => [], 3307 items => [],
2907 z => 100, 3308 z => 100,
2908 @_, 3309 @_,
2909 ); 3310 );
2910 3311
2911 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3312 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2912 3313
2913 for my $item (@{ $self->{items} }) { 3314 for my $item (@{ $self->{items} }) {
2914 my ($widget, $cb) = @$item; 3315 my ($widget, $cb, $tooltip) = @$item;
2915 3316
2916 # handle various types of items, only text for now 3317 # handle various types of items, only text for now
2917 if (!ref $widget) { 3318 if (!ref $widget) {
3319 if ($widget =~ /\t/) {
3320 my ($left, $right) = split /\t/, $widget, 2;
3321
2918 $widget = new CFClient::UI::Label 3322 $widget = new CFPlus::UI::HBox
2919 can_hover => 1, 3323 can_hover => 1,
2920 can_events => 1, 3324 can_events => 1,
3325 tooltip => $tooltip,
3326 children => [
3327 (new CFPlus::UI::Label markup => $left, expand => 1),
3328 (new CFPlus::UI::Label markup => $right, align => +1),
3329 ],
3330 ;
3331
3332 } else {
3333 $widget = new CFPlus::UI::Label
3334 can_hover => 1,
3335 can_events => 1,
2921 text => $widget; 3336 markup => $widget,
3337 tooltip => $tooltip;
3338 }
2922 } 3339 }
2923 3340
2924 $self->{item}{$widget} = $item; 3341 $self->{item}{$widget} = $item;
2925 3342
2926 $self->{vbox}->add ($widget); 3343 $self->{vbox}->add ($widget);
… …
2931 3348
2932# popup given the event (must be a mouse button down event currently) 3349# popup given the event (must be a mouse button down event currently)
2933sub popup { 3350sub popup {
2934 my ($self, $ev) = @_; 3351 my ($self, $ev) = @_;
2935 3352
2936 $self->_emit ("popdown"); 3353 $self->emit ("popdown");
2937 3354
2938 # maybe save $GRAB? must be careful about events... 3355 # maybe save $GRAB? must be careful about events...
2939 $GRAB = $self; 3356 $GRAB = $self;
2940 $self->{button} = $ev->{button}; 3357 $self->{button} = $ev->{button};
2941 3358
2942 $self->show; 3359 $self->show;
2943 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3360 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2944} 3361}
2945 3362
2946sub mouse_motion { 3363sub invoke_mouse_motion {
2947 my ($self, $ev, $x, $y) = @_; 3364 my ($self, $ev, $x, $y) = @_;
2948 3365
2949 # TODO: should use vbox->find_widget or so 3366 # TODO: should use vbox->find_widget or so
2950 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3367 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2951 $self->{hover} = $self->{item}{$HOVER}; 3368 $self->{hover} = $self->{item}{$HOVER};
2952 3369
2953 0 3370 0
2954} 3371}
2955 3372
2956sub button_up { 3373sub invoke_button_up {
2957 my ($self, $ev, $x, $y) = @_; 3374 my ($self, $ev, $x, $y) = @_;
2958 3375
2959 if ($ev->{button} == $self->{button}) { 3376 if ($ev->{button} == $self->{button}) {
2960 undef $GRAB; 3377 undef $GRAB;
2961 $self->hide; 3378 $self->hide;
2962 3379
2963 $self->_emit ("popdown"); 3380 $self->emit ("popdown");
2964 $self->{hover}[1]->() if $self->{hover}; 3381 $self->{hover}[1]->() if $self->{hover};
2965 } else { 3382 } else {
2966 return 0 3383 return 0
2967 } 3384 }
2968 3385
2969 1 3386 1
2970} 3387}
2971 3388
2972############################################################################# 3389#############################################################################
2973 3390
2974package CFClient::UI::Multiplexer; 3391package CFPlus::UI::Multiplexer;
2975 3392
2976our @ISA = CFClient::UI::Container::; 3393our @ISA = CFPlus::UI::Container::;
2977 3394
2978sub new { 3395sub new {
2979 my $class = shift; 3396 my $class = shift;
2980 3397
2981 my $self = $class->SUPER::new ( 3398 my $self = $class->SUPER::new (
… …
2995 3412
2996 $self->{current} = $self->{children}[0] 3413 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} }; 3414 if @{ $self->{children} };
2998} 3415}
2999 3416
3417sub get_current_page {
3418 my ($self) = @_;
3419
3420 $self->{current}
3421}
3422
3000sub set_current_page { 3423sub set_current_page {
3001 my ($self, $page_or_widget) = @_; 3424 my ($self, $page_or_widget) = @_;
3002 3425
3003 my $widget = ref $page_or_widget 3426 my $widget = ref $page_or_widget
3004 ? $page_or_widget 3427 ? $page_or_widget
3005 : $self->{children}[$page_or_widget]; 3428 : $self->{children}[$page_or_widget];
3006 3429
3007 $self->{current} = $widget; 3430 $self->{current} = $widget;
3008 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3431 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3009 3432
3010 $self->_emit (page_changed => $self->{current}); 3433 $self->emit (page_changed => $self->{current});
3011 3434
3012 $self->realloc; 3435 $self->realloc;
3013} 3436}
3014 3437
3015sub visible_children { 3438sub visible_children {
… …
3020 my ($self) = @_; 3443 my ($self) = @_;
3021 3444
3022 $self->{current}->size_request 3445 $self->{current}->size_request
3023} 3446}
3024 3447
3025sub size_allocate { 3448sub invoke_size_allocate {
3026 my ($self, $w, $h) = @_; 3449 my ($self, $w, $h) = @_;
3027 3450
3028 $self->{current}->configure (0, 0, $w, $h); 3451 $self->{current}->configure (0, 0, $w, $h);
3452
3453 1
3029} 3454}
3030 3455
3031sub _draw { 3456sub _draw {
3032 my ($self) = @_; 3457 my ($self) = @_;
3033 3458
3034 $self->{current}->draw; 3459 $self->{current}->draw;
3035} 3460}
3036 3461
3037############################################################################# 3462#############################################################################
3038 3463
3039package CFClient::UI::Notebook; 3464package CFPlus::UI::Notebook;
3040 3465
3041our @ISA = CFClient::UI::VBox::; 3466our @ISA = CFPlus::UI::VBox::;
3042 3467
3043sub new { 3468sub new {
3044 my $class = shift; 3469 my $class = shift;
3045 3470
3046 my $self = $class->SUPER::new ( 3471 my $self = $class->SUPER::new (
3047 buttonbar => (new CFClient::UI::Buttonbar), 3472 buttonbar => (new CFPlus::UI::Buttonbar),
3048 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3473 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3049 # filter => # will be put between multiplexer and $self 3474 # filter => # will be put between multiplexer and $self
3050 @_, 3475 @_,
3051 ); 3476 );
3052 3477
3053 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3478 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3059sub add { 3484sub add {
3060 my ($self, $title, $widget, $tooltip) = @_; 3485 my ($self, $title, $widget, $tooltip) = @_;
3061 3486
3062 Scalar::Util::weaken $self; 3487 Scalar::Util::weaken $self;
3063 3488
3064 $self->{buttonbar}->add (new CFClient::UI::Button 3489 $self->{buttonbar}->add (new CFPlus::UI::Button
3065 markup => $title, 3490 markup => $title,
3066 tooltip => $tooltip, 3491 tooltip => $tooltip,
3067 on_activate => sub { $self->set_current_page ($widget) }, 3492 on_activate => sub { $self->set_current_page ($widget) },
3068 ); 3493 );
3069 3494
3070 $self->{multiplexer}->add ($widget); 3495 $self->{multiplexer}->add ($widget);
3071} 3496}
3072 3497
3498sub get_current_page {
3499 my ($self) = @_;
3500
3501 $self->{multiplexer}->get_current_page
3502}
3503
3073sub set_current_page { 3504sub set_current_page {
3074 my ($self, $page) = @_; 3505 my ($self, $page) = @_;
3075 3506
3076 $self->{multiplexer}->set_current_page ($page); 3507 $self->{multiplexer}->set_current_page ($page);
3077 $self->_emit (page_changed => $self->{multiplexer}{current}); 3508 $self->emit (page_changed => $self->{multiplexer}{current});
3078} 3509}
3079 3510
3080############################################################################# 3511#############################################################################
3081 3512
3513package CFPlus::UI::Selector;
3514
3515use utf8;
3516
3517our @ISA = CFPlus::UI::Button::;
3518
3519sub new {
3520 my $class = shift;
3521
3522 my $self = $class->SUPER::new (
3523 options => [], # [value, title, longdesc], ...
3524 value => undef,
3525 @_,
3526 );
3527
3528 $self->_set_value ($self->{value});
3529
3530 $self
3531}
3532
3533sub invoke_button_down {
3534 my ($self, $ev) = @_;
3535
3536 my @menu_items;
3537
3538 for (@{ $self->{options} }) {
3539 my ($value, $title, $tooltip) = @$_;
3540
3541 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3542 }
3543
3544 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3545}
3546
3547sub _set_value {
3548 my ($self, $value) = @_;
3549
3550 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3551 or return;
3552
3553 $self->{value} = $item->[0];
3554 $self->set_markup ("$item->[1] ⇓");
3555 $self->set_tooltip ($item->[2]);
3556}
3557
3558sub set_value {
3559 my ($self, $value) = @_;
3560
3561 return unless $self->{value} ne $value;
3562
3563 $self->_set_value ($value);
3564 $self->emit (changed => $value);
3565}
3566
3567#############################################################################
3568
3082package CFClient::UI::Statusbox; 3569package CFPlus::UI::Statusbox;
3083 3570
3084our @ISA = CFClient::UI::VBox::; 3571our @ISA = CFPlus::UI::VBox::;
3085 3572
3086sub new { 3573sub new {
3087 my $class = shift; 3574 my $class = shift;
3088 3575
3089 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
… …
3101sub reorder { 3588sub reorder {
3102 my ($self) = @_; 3589 my ($self) = @_;
3103 my $NOW = Time::HiRes::time; 3590 my $NOW = Time::HiRes::time;
3104 3591
3105 # freeze display when hovering over any label 3592 # freeze display when hovering over any label
3106 return if $CFClient::UI::TOOLTIP->{owner} 3593 return if $CFPlus::UI::TOOLTIP->{owner}
3107 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3594 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3108 values %{ $self->{item} }; 3595 values %{ $self->{item} };
3109 3596
3110 while (my ($k, $v) = each %{ $self->{item} }) { 3597 while (my ($k, $v) = each %{ $self->{item} }) {
3111 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3598 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3112 } 3599 }
… …
3133 for ($short) { 3620 for ($short) {
3134 s/^\s+//; 3621 s/^\s+//;
3135 s/\s+/ /g; 3622 s/\s+/ /g;
3136 } 3623 }
3137 3624
3138 new CFClient::UI::Label 3625 new CFPlus::UI::Label
3139 markup => $short, 3626 markup => $short,
3140 tooltip => $item->{tooltip}, 3627 tooltip => $item->{tooltip},
3141 tooltip_font => $::FONT_PROP, 3628 tooltip_font => $::FONT_PROP,
3142 tooltip_width => 0.67, 3629 tooltip_width => 0.67,
3143 fontsize => $item->{fontsize} || $self->{fontsize}, 3630 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3181 $item->{count}++; 3668 $item->{count}++;
3182 } else { 3669 } else {
3183 $item->{count} = 1; 3670 $item->{count} = 1;
3184 $item->{text} = $item->{tooltip} = $text; 3671 $item->{text} = $item->{tooltip} = $text;
3185 } 3672 }
3186 $item->{id} = ++$self->{id}; 3673 $item->{id} += 0.2;#d#
3187 $item->{timeout} = $timeout; 3674 $item->{timeout} = $timeout;
3188 delete $item->{label}; 3675 delete $item->{label};
3189 } else { 3676 } else {
3190 $self->{item}{$group} = { 3677 $self->{item}{$group} = {
3191 id => ++$self->{id}, 3678 id => ++$self->{id},
… …
3197 count => 1, 3684 count => 1,
3198 %arg, 3685 %arg,
3199 }; 3686 };
3200 } 3687 }
3201 3688
3689 $ROOT->on_refresh (reorder => sub {
3202 $self->reorder; 3690 $self->reorder;
3691 });
3203} 3692}
3204 3693
3205sub reconfigure { 3694sub reconfigure {
3206 my ($self) = @_; 3695 my ($self) = @_;
3207 3696
… …
3210 3699
3211 $self->reorder; 3700 $self->reorder;
3212 $self->SUPER::reconfigure; 3701 $self->SUPER::reconfigure;
3213} 3702}
3214 3703
3215sub DESTROY { 3704sub destroy {
3216 my ($self) = @_; 3705 my ($self) = @_;
3217 3706
3218 $self->{timer}->cancel; 3707 $self->{timer}->cancel;
3219 3708
3220 $self->SUPER::DESTROY; 3709 $self->SUPER::destroy;
3221} 3710}
3222 3711
3223############################################################################# 3712#############################################################################
3224 3713
3225package CFClient::UI::Inventory; 3714package CFPlus::UI::Inventory;
3226 3715
3227our @ISA = CFClient::UI::ScrolledWindow::; 3716our @ISA = CFPlus::UI::Table::;
3228 3717
3229sub new { 3718sub new {
3230 my $class = shift; 3719 my $class = shift;
3231 3720
3232 my $self = $class->SUPER::new ( 3721 my $self = $class->SUPER::new (
3233 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3722 col_expand => [0, 1, 0],
3723 items => [],
3234 @_, 3724 @_,
3235 ); 3725 );
3236 3726
3727 $self->set_sort_order (undef);
3728
3237 $self 3729 $self
3730}
3731
3732sub update_items {
3733 my ($self) = @_;
3734
3735 $self->clear;
3736
3737 my @item = $self->{sort}->(@{ $self->{items} });
3738
3739 my @adds;
3740 my $row = 0;
3741 for my $item ($self->{sort}->(@{ $self->{items} })) {
3742 CFPlus::Item::update_widgets $item;
3743
3744 push @adds, 0, $row, $item->{face_widget};
3745 push @adds, 1, $row, $item->{desc_widget};
3746 push @adds, 2, $row, $item->{weight_widget};
3747
3748 $row++;
3749 }
3750
3751 $self->add (@adds);
3752}
3753
3754sub set_sort_order {
3755 my ($self, $order) = @_;
3756
3757 $self->{sort} = $order ||= sub {
3758 sort {
3759 $a->{type} <=> $b->{type}
3760 or $a->{name} cmp $b->{name}
3761 } @_
3762 };
3763
3764 $self->update_items;
3238} 3765}
3239 3766
3240sub set_items { 3767sub set_items {
3241 my ($self, $items) = @_; 3768 my ($self, $items) = @_;
3242 3769
3243 $self->{child}->clear; 3770 $self->{items} = [$items ? values %$items : ()];
3244 return unless $items; 3771 $self->update_items;
3245
3246 my @items = sort {
3247 ($a->{type} <=> $b->{type})
3248 or ($a->{name} cmp $b->{name})
3249 } @$items;
3250
3251 $self->{real_items} = \@items;
3252
3253 my $row = 0;
3254 for my $item (@items) {
3255 CFClient::Item::update_widgets $item;
3256
3257 $self->{child}->add (0, $row, $item->{face_widget});
3258 $self->{child}->add (1, $row, $item->{desc_widget});
3259 $self->{child}->add (2, $row, $item->{weight_widget});
3260
3261 $row++;
3262 }
3263} 3772}
3264 3773
3265############################################################################# 3774#############################################################################
3266 3775
3267package CFClient::UI::BindEditor;
3268
3269our @ISA = CFClient::UI::FancyFrame::;
3270
3271sub new {
3272 my $class = shift;
3273
3274 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3275
3276 $self->add (my $vb = new CFClient::UI::VBox);
3277
3278
3279 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3280 text => "start recording",
3281 tooltip => "Start/Stops recording of actions."
3282 ."All subsequent actions after the recording started will be captured."
3283 ."The actions are displayed after the record was stopped."
3284 ."To bind the action you have to click on the 'Bind' button",
3285 on_activate => sub {
3286 unless ($self->{recording}) {
3287 $self->start;
3288 } else {
3289 $self->stop;
3290 }
3291 });
3292
3293 $vb->add (new CFClient::UI::Label text => "Actions:");
3294 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3295
3296 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3297 $vb->add (my $hb = new CFClient::UI::HBox);
3298 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3299 $hb->add (new CFClient::UI::Button
3300 text => "bind",
3301 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3302 on_activate => sub {
3303 $self->ask_for_bind;
3304 });
3305
3306 $vb->add (my $hb = new CFClient::UI::HBox);
3307 $hb->add (new CFClient::UI::Button
3308 text => "ok",
3309 expand => 1,
3310 tooltip => "This closes the binding editor and saves the binding",
3311 on_activate => sub {
3312 $self->hide;
3313 $self->commit;
3314 });
3315
3316 $hb->add (new CFClient::UI::Button
3317 text => "cancel",
3318 expand => 1,
3319 tooltip => "This closes the binding editor without saving",
3320 on_activate => sub {
3321 $self->hide;
3322 $self->{binding_cancel}->()
3323 if $self->{binding_cancel};
3324 });
3325
3326 $self->update_binding_widgets;
3327
3328 $self
3329}
3330
3331sub commit {
3332 my ($self) = @_;
3333 my ($mod, $sym, $cmds) = $self->get_binding;
3334 if ($sym != 0 && @$cmds > 0) {
3335 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3336 ."'. Don't forget 'Save Config'!");
3337 $self->{binding_change}->($mod, $sym, $cmds)
3338 if $self->{binding_change};
3339 } else {
3340 $::STATUSBOX->add ("No action bound, no key or action specified!");
3341 $self->{binding_cancel}->()
3342 if $self->{binding_cancel};
3343 }
3344}
3345
3346sub start {
3347 my ($self) = @_;
3348
3349 $self->{rec_btn}->set_text ("stop recording");
3350 $self->{recording} = 1;
3351 $self->clear_command_list;
3352 $::CONN->start_record if $::CONN;
3353}
3354
3355sub stop {
3356 my ($self) = @_;
3357
3358 $self->{rec_btn}->set_text ("start recording");
3359 $self->{recording} = 0;
3360
3361 my $rec;
3362 $rec = $::CONN->stop_record if $::CONN;
3363 return unless ref $rec eq 'ARRAY';
3364 $self->set_command_list ($rec);
3365}
3366
3367
3368sub ask_for_bind_and_commit {
3369 my ($self) = @_;
3370 $self->ask_for_bind (1);
3371}
3372
3373sub ask_for_bind {
3374 my ($self, $commit) = @_;
3375
3376 CFClient::Binder::open_binding_dialog (sub {
3377 my ($mod, $sym) = @_;
3378 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3379 $self->update_binding_widgets;
3380 $self->commit if $commit;
3381 });
3382}
3383
3384# $mod and $sym are the modifiers and key symbol
3385# $cmds is a array ref of strings (the commands)
3386# $cb is the callback that is executed on OK
3387# $ccb is the callback that is executed on CANCEL and
3388# when the binding was unsuccessful on OK
3389sub set_binding {
3390 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3391
3392 $self->clear_command_list;
3393 $self->{recording} = 0;
3394 $self->{rec_btn}->set_text ("start recording");
3395
3396 $self->{binding} = [$mod, $sym];
3397 $self->{commands} = $cmds;
3398
3399 $self->{binding_change} = $cb;
3400 $self->{binding_cancel} = $ccb;
3401
3402 $self->update_binding_widgets;
3403}
3404
3405# this is a shortcut method that asks for a binding
3406# and then just binds it.
3407sub do_quick_binding {
3408 my ($self, $cmds) = @_;
3409 $self->set_binding (undef, undef, $cmds, sub {
3410 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3411 });
3412 $self->ask_for_bind (1);
3413}
3414
3415sub update_binding_widgets {
3416 my ($self) = @_;
3417 my ($mod, $sym, $cmds) = $self->get_binding;
3418 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3419 $self->set_command_list ($cmds);
3420}
3421
3422sub get_binding {
3423 my ($self) = @_;
3424 return (
3425 $self->{binding}->[0],
3426 $self->{binding}->[1],
3427 [ grep { defined $_ } @{$self->{commands}} ]
3428 );
3429}
3430
3431sub clear_command_list {
3432 my ($self) = @_;
3433 $self->{cmdbox}->clear ();
3434}
3435
3436sub set_command_list {
3437 my ($self, $cmds) = @_;
3438
3439 $self->{cmdbox}->clear ();
3440 $self->{commands} = $cmds;
3441
3442 my $idx = 0;
3443
3444 for (@$cmds) {
3445 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3446
3447 my $i = $idx;
3448 $hb->add (new CFClient::UI::Label text => $_);
3449 $hb->add (new CFClient::UI::Button
3450 text => "delete",
3451 tooltip => "Deletes the action from the record",
3452 on_activate => sub {
3453 $self->{cmdbox}->remove ($hb);
3454 $cmds->[$i] = undef;
3455 });
3456
3457
3458 $idx++
3459 }
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::SpellList; 3776package CFPlus::UI::SpellList;
3465 3777
3466our @ISA = CFClient::UI::Table::; 3778our @ISA = CFPlus::UI::Table::;
3467 3779
3468sub new { 3780sub new {
3469 my $class = shift; 3781 my $class = shift;
3470 3782
3471 my $self = $class->SUPER::new ( 3783 my $self = $class->SUPER::new (
… …
3473 commands => [], 3785 commands => [],
3474 @_, 3786 @_,
3475 ) 3787 )
3476} 3788}
3477 3789
3478# XXX: Do sorting? Argl... 3790my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3791
3792my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3793 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3794my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3795 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3796my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3797 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3798my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3799 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3800my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3801 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3802
3803sub rebuild_spell_list {
3804 my ($self) = @_;
3805
3806 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3807 $self->clear;
3808
3809 return unless $::CONN;
3810
3811 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3812 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3813 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3814 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3815 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3816
3817 my $row = 0;
3818
3819 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3820 my $spell = $self->{spell}{$_};
3821
3822 $row++;
3823
3824 my $spell_cb = sub {
3825 my ($widget, $ev) = @_;
3826
3827 if ($ev->{button} == 1) {
3828 $::CONN->user_send ("cast $spell->{name}");
3829 } elsif ($ev->{button} == 2) {
3830 $::CONN->user_send ("invoke $spell->{name}");
3831 } elsif ($ev->{button} == 3) {
3832 (new CFPlus::UI::Menu
3833 items => [
3834 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3835 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3836 ],
3837 )->popup ($ev);
3838 } else {
3839 return 0;
3840 }
3841
3842 1
3843 };
3844
3845 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3846
3847 #TODO: add path info to tooltip
3848 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3849
3850 $self->add (0, $row, new CFPlus::UI::Face
3851 face => $spell->{face},
3852 can_hover => 1,
3853 can_events => 1,
3854 tooltip => $tooltip,
3855 on_button_down => $spell_cb,
3856 );
3857
3858 $self->add (1, $row, new CFPlus::UI::Label
3859 expand => 1,
3860 text => $spell->{name},
3861 can_hover => 1,
3862 can_events => 1,
3863 tooltip => $tooltip,
3864 on_button_down => $spell_cb,
3865 );
3866
3867 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3868 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3869 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3870 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3871 }
3872 });
3873}
3874
3479sub add_spell { 3875sub add_spell {
3480 my ($self, $spell) = @_; 3876 my ($self, $spell) = @_;
3877
3481 $self->{spells}->{$spell->{name}} = $spell; 3878 $self->{spell}->{$spell->{name}} = $spell;
3482 3879 $self->rebuild_spell_list;
3483 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3484 face => $spell->{face},
3485 can_hover => 1,
3486 can_events => 1,
3487 tooltip => $spell->{message});
3488
3489 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3490 text => $spell->{name},
3491 can_hover => 1,
3492 can_events => 1,
3493 tooltip => $spell->{message},
3494 expand => 1);
3495
3496 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3498 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3499 expand => 1);
3500
3501 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3502 text => "bind to key",
3503 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3504}
3505
3506sub rebuild_spell_list {
3507 my ($self) = @_;
3508 $self->{tbl_idx} = 0;
3509 $self->add_spell ($_) for values %{$self->{spells}};
3510} 3880}
3511 3881
3512sub remove_spell { 3882sub remove_spell {
3513 my ($self, $spell) = @_; 3883 my ($self, $spell) = @_;
3884
3514 delete $self->{spells}->{$spell->{name}}; 3885 delete $self->{spell}->{$spell->{name}};
3515 $self->rebuild_spell_list; 3886 $self->rebuild_spell_list;
3516} 3887}
3517 3888
3889sub clear_spells {
3890 my ($self) = @_;
3891
3892 $self->{spell} = {};
3893 $self->rebuild_spell_list;
3894}
3895
3518############################################################################# 3896#############################################################################
3519 3897
3520package CFClient::UI::Root; 3898package CFPlus::UI::Root;
3521 3899
3522our @ISA = CFClient::UI::Container::; 3900our @ISA = CFPlus::UI::Container::;
3523 3901
3524use List::Util qw(min max); 3902use List::Util qw(min max);
3525 3903
3526use CFClient::OpenGL; 3904use CFPlus::OpenGL;
3527 3905
3528sub new { 3906sub new {
3529 my $class = shift; 3907 my $class = shift;
3530 3908
3531 my $self = $class->SUPER::new ( 3909 my $self = $class->SUPER::new (
… …
3556 $coord = $max - $size if $coord > $max - $size; 3934 $coord = $max - $size if $coord > $max - $size;
3557 3935
3558 int $coord + 0.5 3936 int $coord + 0.5
3559} 3937}
3560 3938
3561sub size_allocate { 3939sub invoke_size_allocate {
3562 my ($self, $w, $h) = @_; 3940 my ($self, $w, $h) = @_;
3563 3941
3564 for my $child ($self->children) { 3942 for my $child ($self->children) {
3565 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3943 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3566 3944
… …
3570 $X = _to_pixel $X, $W, $self->{w}; 3948 $X = _to_pixel $X, $W, $self->{w};
3571 $Y = _to_pixel $Y, $H, $self->{h}; 3949 $Y = _to_pixel $Y, $H, $self->{h};
3572 3950
3573 $child->configure ($X, $Y, $W, $H); 3951 $child->configure ($X, $Y, $W, $H);
3574 } 3952 }
3953
3954 1
3575} 3955}
3576 3956
3577sub coord2local { 3957sub coord2local {
3578 my ($self, $x, $y) = @_; 3958 my ($self, $x, $y) = @_;
3579 3959
… …
3705 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4085 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3706 4086
3707 $w = 0 if $w < 0; 4087 $w = 0 if $w < 0;
3708 $h = 0 if $h < 0; 4088 $h = 0 if $h < 0;
3709 4089
4090 $w = max $widget->{min_w}, $w;
4091 $h = max $widget->{min_h}, $h;
4092
4093# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4094# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4095
4096 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4097 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4098
3710 $w = int $w + 0.5; 4099 $w = int $w + 0.5;
3711 $h = int $h + 0.5; 4100 $h = int $h + 0.5;
3712 4101
3713 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4102 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3714 $widget->{old_w} = $widget->{w}; 4103 $widget->{old_w} = $widget->{w};
… …
3737 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4126 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3738 glMatrixMode GL_MODELVIEW; 4127 glMatrixMode GL_MODELVIEW;
3739 glLoadIdentity; 4128 glLoadIdentity;
3740 4129
3741 { 4130 {
3742 package CFClient::UI::Base; 4131 package CFPlus::UI::Base;
3743 4132
3744 ($draw_x, $draw_y, $draw_w, $draw_h) = 4133 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3745 (0, 0, $self->{w}, $self->{h}); 4134 (0, 0, $self->{w}, $self->{h});
3746 }
3747 4135
3748 $self->_draw; 4136 $self->_draw;
4137 }
3749} 4138}
3750 4139
3751############################################################################# 4140#############################################################################
3752 4141
3753package CFClient::UI; 4142package CFPlus::UI;
3754 4143
3755$ROOT = new CFClient::UI::Root; 4144$ROOT = new CFPlus::UI::Root;
3756$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4145$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3757 4146
37581 41471
3759 4148

Diff Legend

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