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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines