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

Diff Legend

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