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.303 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

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

Diff Legend

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