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.314 by root, Mon Jun 26 21:59:04 2006 UTC vs.
Revision 1.413 by root, Mon Jul 23 15:30:45 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->emit ("focus_out"); 320 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
… …
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
345 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
346 380
347 if ($self->{aspect}) { 381 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
349 383
350 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 386
353 # use alignment to adjust x, y 387 # use alignment to adjust x, y
354 388
355 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
397 431
398 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
399 433
400 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
401 435
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 439 }
406} 440}
407 441
408# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
409sub coord2local { 443sub coord2local {
410 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
411 445
446 Carp::confess unless $self->{parent};#d#
447
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 449}
414 450
415# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
416sub coord2global { 452sub coord2global {
417 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
418 454
455 Carp::confess unless $self->{parent};#d#
456
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 458}
421 459
422sub invoke_focus_in { 460sub invoke_focus_in {
423 my ($self) = @_; 461 my ($self) = @_;
424 462
425 return if $FOCUS == $self; 463 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
427 465
428 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
429 467
430 $focus->update if $focus; 468 $self->update;
431 $FOCUS->update;
432 469
433 0 470 0
434} 471}
435 472
436sub invoke_focus_out { 473sub invoke_focus_out {
437 my ($self) = @_; 474 my ($self) = @_;
438 475
439 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
440 477
441 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
442 479
443 $focus->update if $focus; #? 480 $self->update;
444 481
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 483 unless $FOCUS;
447 484
448 0 485 0
449} 486}
450 487
451sub grab_focus { 488sub grab_focus {
452 my ($self) = @_; 489 my ($self) = @_;
453 490
491 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 492 $self->emit ("focus_in");
455} 493}
456 494
457sub invoke_mouse_motion { 1 } 495sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 496sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 497sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
461 500
462sub invoke_button_down { 501sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
464 503
465 $self->grab_focus; 504 $self->grab_focus;
466 505
467 1 506 0
468} 507}
469 508
470sub connect { 509sub connect {
471 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
472 511
473 push @{ $self->{signal_cb}{$signal} }, $cb; 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 }
474} 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);
475 532
476sub emit { 533sub emit {
477 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
478 535
479 #d##TODO# stop propagating at first true, do not use sum 536 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 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
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 554}
484 555
485sub find_widget { 556#sub find_widget {
486 my ($self, $x, $y) = @_; 557# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 558
497sub set_parent { 559sub set_parent {
498 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
499 561
500 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
502} 564}
503 565
504sub realloc { 566sub realloc {
505 my ($self) = @_; 567 my ($self) = @_;
… …
531 593
532# 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
533# functions seems pointless. 595# functions seems pointless.
534our ($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
535 597
536sub draw { 598#sub draw {
537 my ($self) = @_; 599#CFPlus.xs
538
539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
548
549 glPushMatrix;
550 glTranslate $self->{x}, $self->{y}, 0;
551
552 if ($self == $HOVER && $self->{can_hover}) {
553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
554 glEnable GL_BLEND;
555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
556 glBegin GL_QUADS;
557 glVertex 0 , 0;
558 glVertex $self->{w}, 0;
559 glVertex $self->{w}, $self->{h};
560 glVertex 0 , $self->{h};
561 glEnd;
562 glDisable GL_BLEND;
563 }
564
565 if ($ENV{CFPLUS_DEBUG} & 1) {
566 glPushMatrix;
567 glColor 1, 1, 0, 1;
568 glTranslate 0.375, 0.375;
569 glBegin GL_LINE_LOOP;
570 glVertex 0 , 0;
571 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1;
574 glEnd;
575 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 }
578
579 $self->_draw;
580 glPopMatrix;
581}
582 600
583sub _draw { 601sub _draw {
584 my ($self) = @_; 602 my ($self) = @_;
585 603
586 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
587} 605}
588 606
589sub DESTROY { 607sub DESTROY {
590 my ($self) = @_; 608 my ($self) = @_;
591 609
592 delete $WIDGET{$self+0}; 610 return if CFPlus::in_destruct;
593 611
594 eval { $self->destroy }; 612 eval { $self->destroy };
595 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};
596} 616}
597 617
598############################################################################# 618#############################################################################
599 619
600package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
601 621
602our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
603 623
604use strict; 624use strict;
605use CFClient::OpenGL; 625use CFPlus::OpenGL;
606 626
607sub new { 627sub new {
608 my $class = shift; 628 my $class = shift;
609 629
610 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
641 } 661 }
642} 662}
643 663
644############################################################################# 664#############################################################################
645 665
646package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
647 667
648our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
649 669
650sub new { 670sub new {
651 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
653} 673}
… …
660 680
661sub draw { } 681sub draw { }
662 682
663############################################################################# 683#############################################################################
664 684
665package CFClient::UI::Container; 685package CFPlus::UI::Container;
666 686
667our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
668 688
669sub new { 689sub new {
670 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
671 691
672 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
676 can_events => 0, 696 can_events => 0,
677 %arg, 697 %arg,
678 ); 698 );
679 699
680 $self->add (@$children) 700 $self->add (@$children)
681 if $children; 701 if $children && @$children;
682 702
683 $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;
684} 712}
685 713
686sub add { 714sub add {
687 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
688 716
689 $_->set_parent ($self) 717 $_->set_parent ($self)
690 for @widgets; 718 for @widgets;
691 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
692 use sort 'stable'; 721 use sort 'stable';
693 722
694 $self->{children} = [ 723 $self->{children} = [
695 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
696 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
697 ]; 726 ];
698 727
699 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
700} 733}
701 734
702sub children { 735sub children {
703 @{ $_[0]{children} } 736 @{ $_[0]{children} }
704} 737}
705 738
706sub remove { 739sub remove {
707 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
708 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
709 delete $child->{parent}; 745 delete $child->{parent};
710 $child->hide; 746 $child->hide;
711
712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
713 749
714 $self->realloc; 750 $self->realloc;
715} 751}
716 752
717sub clear { 753sub clear {
718 my ($self) = @_; 754 my ($self) = @_;
719 755
720 my $children = delete $self->{children}; 756 my $children = $self->{children};
721 $self->{children} = []; 757 $self->{children} = [];
722 758
723 for (@$children) { 759 for (@$children) {
724 delete $_->{parent}; 760 delete $_->{parent};
725 $_->hide; 761 $_->hide;
… …
745} 781}
746 782
747sub _draw { 783sub _draw {
748 my ($self) = @_; 784 my ($self) = @_;
749 785
750 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
751} 787}
752 788
753############################################################################# 789#############################################################################
754 790
755package CFClient::UI::Bin; 791package CFPlus::UI::Bin;
756 792
757our @ISA = CFClient::UI::Container::; 793our @ISA = CFPlus::UI::Container::;
758 794
759sub new { 795sub new {
760 my ($class, %arg) = @_; 796 my ($class, %arg) = @_;
761 797
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 798 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 799
764 $class->SUPER::new (children => [$child], %arg) 800 $class->SUPER::new (children => [$child], %arg)
765} 801}
766 802
767sub add { 803sub add {
768 my ($self, $child) = @_; 804 my ($self, $child) = @_;
769 805
770 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
771 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
772} 808}
773 809
774sub remove { 810sub remove {
775 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
776 812
777 $self->SUPER::remove ($widget); 813 $self->SUPER::remove ($widget);
778 814
779 $self->{children} = [new CFClient::UI::Empty] 815 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 816 unless @{$self->{children}};
781} 817}
782 818
783sub child { $_[0]->{children}[0] } 819sub child { $_[0]->{children}[0] }
784 820
… …
796 832
797############################################################################# 833#############################################################################
798 834
799# back-buffered drawing area 835# back-buffered drawing area
800 836
801package CFClient::UI::Window; 837package CFPlus::UI::Window;
802 838
803our @ISA = CFClient::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
804 840
805use CFClient::OpenGL; 841use CFPlus::OpenGL;
806 842
807sub new { 843sub new {
808 my ($class, %arg) = @_; 844 my ($class, %arg) = @_;
809 845
810 my $self = $class->SUPER::new (%arg); 846 my $self = $class->SUPER::new (%arg);
… …
832} 868}
833 869
834sub render_child { 870sub render_child {
835 my ($self) = @_; 871 my ($self) = @_;
836 872
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 873 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 874 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 875 glClear GL_COLOR_BUFFER_BIT;
840 876
841 { 877 {
842 package CFClient::UI::Base; 878 package CFPlus::UI::Base;
843 879
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 880 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 881 (0, 0, $self->{w}, $self->{h});
882
883 $self->_render;
846 } 884 }
847
848 $self->_render;
849 }; 885 };
850} 886}
851 887
852sub _draw { 888sub _draw {
853 my ($self) = @_; 889 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 890
857 my $tex = $self->{texture} 891 my $tex = $self->{texture}
858 or return; 892 or return;
859 893
860 glEnable GL_TEXTURE_2D; 894 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 896 glColor 0, 0, 0, 1;
863 897
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 898 $tex->draw_quad_alpha_premultiplied (0, 0);
865 899
866 glDisable GL_TEXTURE_2D; 900 glDisable GL_TEXTURE_2D;
867} 901}
868 902
869############################################################################# 903#############################################################################
870 904
871package CFClient::UI::ViewPort; 905package CFPlus::UI::ViewPort;
872 906
907use List::Util qw(min max);
908
873our @ISA = CFClient::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
874 910
875sub new { 911sub new {
876 my $class = shift; 912 my $class = shift;
877 913
878 $class->SUPER::new ( 914 $class->SUPER::new (
… …
885sub size_request { 921sub size_request {
886 my ($self) = @_; 922 my ($self) = @_;
887 923
888 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889 925
890 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
892 928
893 ($w, $h) 929 ($w, $h)
894} 930}
895 931
896sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
908} 944}
909 945
910sub set_offset { 946sub set_offset {
911 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
912 948
949 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
950 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
951
952 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
915 955
956 $self->emit (changed => $x, $y);
916 $self->update; 957 $self->update;
958 }
917} 959}
918 960
919# hmm, this does not work for topleft of $self... but we should not ask for that 961# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 962sub coord2local {
921 my ($self, $x, $y) = @_; 963 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 978 my ($self, $x, $y) = @_;
937 979
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 980 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 981 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 982 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 983 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 984 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 985 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 986 }
945} 987}
946 988
947sub _render { 989sub _render {
948 my ($self) = @_; 990 my ($self) = @_;
949 991
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 992 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}; 993 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 994
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 995 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 996
955 $self->SUPER::_render; 997 $self->SUPER::_render;
956} 998}
957 999
958############################################################################# 1000#############################################################################
959 1001
960package CFClient::UI::ScrolledWindow; 1002package CFPlus::UI::ScrolledWindow;
961 1003
962our @ISA = CFClient::UI::HBox::; 1004our @ISA = CFPlus::UI::Table::;
963 1005
964sub new { 1006sub new {
965 my ($class, %arg) = @_; 1007 my ($class, %arg) = @_;
966 1008
967 my $child = delete $arg{child}; 1009 my $child = delete $arg{child};
968 1010
969 my $self; 1011 my $self;
970 1012
971 my $slider = new CFClient::UI::Slider 1013 my $hslider = new CFPlus::UI::Slider
1014 col => 0,
1015 row => 1,
1016 vertical => 0,
1017 range => [0, 0, 1, 0.01], # HACK fix
1018 on_changed => sub {
1019 $self->{hpos} = $_[1];
1020 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1021 },
1022 ;
1023
1024 my $vslider = new CFPlus::UI::Slider
1025 col => 1,
1026 row => 0,
972 vertical => 1, 1027 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1028 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1029 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1030 $self->{vpos} = $_[1];
1031 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1032 },
977 ; 1033 ;
978 1034
979 $self = $class->SUPER::new ( 1035 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1036 scroll_x => 0,
1037 scroll_y => 1,
1038 can_events => 1,
981 slider => $slider, 1039 hslider => $hslider,
1040 vslider => $vslider,
1041 col_expand => [1, 0],
1042 row_expand => [1, 0],
982 %arg, 1043 %arg,
983 ); 1044 );
984 1045
1046 $self->{vp} = new CFPlus::UI::ViewPort
1047 col => 0,
1048 row => 0,
1049 expand => 1,
1050 scroll_x => $self->{scroll_x},
1051 scroll_y => $self->{scroll_y},
1052 on_changed => sub {
1053 my ($vp, $x, $y) = @_;
1054
1055 $vp->{parent}{hslider}->set_value ($x);
1056 $vp->{parent}{vslider}->set_value ($y);
1057
1058 0
1059 },
1060 on_size_allocate => sub {
1061 my ($vp, $w, $h) = @_;
1062 $vp->{parent}->update_slider;
1063 0
1064 },
1065 ;
1066
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1067 $self->SUPER::add ($self->{vp});
1068
986 $self->add ($child) if $child; 1069 $self->add ($child) if $child;
987 1070
988 $self 1071 $self
989} 1072}
990
991#TODO# update range on size_allocate depending on child
992 1073
993sub add { 1074sub add {
994 my ($self, $widget) = @_; 1075 my ($self, $widget) = @_;
995 1076
996 $self->{vp}->add ($self->{child} = $widget); 1077 $self->{vp}->add ($self->{child} = $widget);
997} 1078}
998 1079
999sub update_slider { 1080sub update_slider {
1000 my ($self) = @_; 1081 my ($self) = @_;
1001 1082
1083 my $child = ($self->{vp} or return)->child;
1084
1085 if ($self->{scroll_x}) {
1086 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1087 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1003}
1004 1088
1005sub update { 1089 my $visible = $w1 > $w2;
1090 if ($visible != $self->{hslider_visible}) {
1091 $self->{hslider_visible} = $visible;
1092 $visible ? $self->SUPER::add ($self->{hslider})
1093 : $self->SUPER::remove ($self->{hslider});
1094 }
1095 }
1096
1097 if ($self->{scroll_y}) {
1098 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1099 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1100
1101 my $visible = $h1 > $h2;
1102 if ($visible != $self->{vslider_visible}) {
1103 $self->{vslider_visible} = $visible;
1104 $visible ? $self->SUPER::add ($self->{vslider})
1105 : $self->SUPER::remove ($self->{vslider});
1106 }
1107 }
1108}
1109
1110sub start_dragging {
1006 my ($self) = @_; 1111 my ($self, $ev) = @_;
1007 1112
1008 $self->SUPER::update; 1113 $self->grab_focus;
1009 1114
1010 $self->update_slider; 1115 my $ox = $self->{vp}{view_x};
1116 my $oy = $self->{vp}{view_y};
1117
1118 $self->{motion} = sub {
1119 my ($ev, $x, $y) = @_;
1120
1121 $ox -= $ev->{xrel};
1122 $oy -= $ev->{yrel};
1123
1124 $self->{vp}->set_offset ($ox, $oy);
1125 };
1126}
1127
1128sub invoke_mouse_wheel {
1129 my ($self, $ev) = @_;
1130
1131 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1132 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1133
1134 1
1135}
1136
1137sub invoke_button_down {
1138 my ($self, $ev, $x, $y) = @_;
1139
1140 if ($ev->{button} == 2) {
1141 $self->start_dragging ($ev);
1142 return 1;
1143 }
1144
1145 0
1146}
1147
1148sub invoke_button_up {
1149 my ($self, $ev, $x, $y) = @_;
1150
1151 if (delete $self->{motion}) {
1152 return 1;
1153 }
1154
1155 0
1156}
1157
1158sub invoke_mouse_motion {
1159 my ($self, $ev, $x, $y) = @_;
1160
1161 if ($self->{motion}) {
1162 $self->{motion}->($ev, $x, $y);
1163 return 1;
1164 }
1165
1166 0
1011} 1167}
1012 1168
1013sub invoke_size_allocate { 1169sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1170 my ($self, $w, $h) = @_;
1015 1171
1016 $self->update_slider; 1172 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1173 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1174}
1020 1175
1021############################################################################# 1176#############################################################################
1022 1177
1023package CFClient::UI::Frame; 1178package CFPlus::UI::Frame;
1024 1179
1025our @ISA = CFClient::UI::Bin::; 1180our @ISA = CFPlus::UI::Bin::;
1026 1181
1027use CFClient::OpenGL; 1182use CFPlus::OpenGL;
1028 1183
1029sub new { 1184sub new {
1030 my $class = shift; 1185 my $class = shift;
1031 1186
1032 $class->SUPER::new ( 1187 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1213 $self->SUPER::_draw;
1059} 1214}
1060 1215
1061############################################################################# 1216#############################################################################
1062 1217
1063package CFClient::UI::FancyFrame; 1218package CFPlus::UI::FancyFrame;
1064 1219
1065our @ISA = CFClient::UI::Bin::; 1220our @ISA = CFPlus::UI::Bin::;
1066 1221
1067use CFClient::OpenGL; 1222use CFPlus::OpenGL;
1223
1224sub new {
1225 my ($class, %arg) = @_;
1226
1227 if ((exists $arg{label}) && !ref $arg{label}) {
1228 $arg{label} = new CFPlus::UI::Label
1229 align => 1,
1230 valign => 0,
1231 text => $arg{label},
1232 fontsize => ($arg{border} || 0.8) * 0.75;
1233 }
1234
1235 my $self = $class->SUPER::new (
1236 # label => "",
1237 fg => [0.6, 0.3, 0.1],
1238 border => 0.8,
1239 style => 'single',
1240 %arg,
1241 );
1242
1243 $self
1244}
1245
1246sub add {
1247 my ($self, @widgets) = @_;
1248
1249 $self->SUPER::add (@widgets);
1250 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1251}
1252
1253sub border {
1254 int $_[0]{border} * $::FONTSIZE
1255}
1256
1257sub size_request {
1258 my ($self) = @_;
1259
1260 ($self->{label_w}, undef) = $self->{label}->size_request
1261 if $self->{label};
1262
1263 my ($w, $h) = $self->SUPER::size_request;
1264
1265 (
1266 $w + $self->border * 2,
1267 $h + $self->border * 2,
1268 )
1269}
1270
1271sub invoke_size_allocate {
1272 my ($self, $w, $h) = @_;
1273
1274 my $border = $self->border;
1275
1276 $w -= List::Util::max 0, $border * 2;
1277 $h -= List::Util::max 0, $border * 2;
1278
1279 if (my $label = $self->{label}) {
1280 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1281 $label->{h} = List::Util::min $h, $border;
1282 $label->invoke_size_allocate ($label->{w}, $label->{h});
1283 }
1284
1285 $self->child->configure ($border, $border, $w, $h);
1286
1287 1
1288}
1289
1290sub _draw {
1291 my ($self) = @_;
1292
1293 my $child = $self->{children}[0];
1294
1295 my $border = $self->border;
1296 my ($w, $h) = ($self->{w}, $self->{h});
1297
1298 $child->draw;
1299
1300 glColor @{$self->{fg}};
1301 glBegin GL_LINE_STRIP;
1302 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1303 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1304 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1305 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1306 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1307 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1308 glEnd;
1309
1310 if ($self->{label}) {
1311 glTranslate $border * 2, 0;
1312 $self->{label}->_draw;
1313 }
1314}
1315
1316#############################################################################
1317
1318package CFPlus::UI::Toplevel;
1319
1320our @ISA = CFPlus::UI::Bin::;
1321
1322use CFPlus::OpenGL;
1068 1323
1069my $bg = 1324my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1325 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1326 mipmap => 1, wrap => 1;
1072 1327
1073my @border = 1328my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1329 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1330 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1331
1332my @icon =
1333 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1334 qw(x1_move.png x1_resize.png);
1076 1335
1077sub new { 1336sub new {
1078 my ($class, %arg) = @_; 1337 my ($class, %arg) = @_;
1079 1338
1080 my $self = $class->SUPER::new ( 1339 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1340 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1341 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1342 border => 0.6,
1084 can_events => 1, 1343 can_events => 1,
1085 min_w => 16, 1344 min_w => 64,
1086 min_h => 16, 1345 min_h => 32,
1087 %arg, 1346 %arg,
1088 ); 1347 );
1089 1348
1090 $self->{title_widget} = new CFClient::UI::Label 1349 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1350 align => 0,
1092 valign => 1, 1351 valign => 1,
1093 text => $self->{title}, 1352 text => $self->{title},
1094 fontsize => $self->{border}, 1353 fontsize => $self->{border},
1095 if exists $self->{title}; 1354 if exists $self->{title};
1096 1355
1097 if ($self->{has_close_button}) { 1356 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1357 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1358 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1359 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1360 on_activate => sub { $self->emit ("delete") };
1102 1361
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1362 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1363 }
1105 1364
1106 $self 1365 $self
1107} 1366}
1108 1367
1109sub add { 1368sub add {
1110 my ($self, @widgets) = @_; 1369 my ($self, @widgets) = @_;
1111 1370
1112 $self->SUPER::add (@widgets); 1371 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1372 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1373 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1374}
1116 1375
1117sub border { 1376sub border {
1118 int $_[0]{border} * $::FONTSIZE 1377 int $_[0]{border} * $::FONTSIZE
1119} 1378}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1411 $self->child->configure ($border, $border, $w, $h);
1153 1412
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1413 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1414 if $self->{close_button};
1156 1415
1416 1
1417}
1418
1419sub invoke_delete {
1420 my ($self) = @_;
1421
1422 $self->hide;
1423
1157 1 1424 1
1158} 1425}
1159 1426
1160sub invoke_button_down { 1427sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1428 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1486 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1487
1221 ! ! $self->{motion} 1488 ! ! $self->{motion}
1222} 1489}
1223 1490
1491sub invoke_visibility_change {
1492 my ($self, $visible) = @_;
1493
1494 delete $self->{motion} unless $visible;
1495
1496 0
1497}
1498
1224sub _draw { 1499sub _draw {
1225 my ($self) = @_; 1500 my ($self) = @_;
1226 1501
1227 my $child = $self->{children}[0]; 1502 my $child = $self->{children}[0];
1228 1503
… …
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1508 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234 1509
1235 my $border = $self->border; 1510 my $border = $self->border;
1236 1511
1237 glColor @{ $self->{border_bg} }; 1512 glColor @{ $self->{border_bg} };
1238 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1513 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1514 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1515 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1516 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1517
1518 # move
1519 my $w2 = ($w - $border) * .5;
1520 my $h2 = ($h - $border) * .5;
1521 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1522 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1523 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1524
1525 # resize
1526 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1527 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1528 unless $self->{has_close_button};
1529 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1530 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242 1531
1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1532 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244 glColor @{ $self->{bg} }; 1533 glColor @{ $self->{bg} };
1245 1534
1246 # TODO: repeat texture not scale 1535 # TODO: repeat texture not scale
… …
1265 if $self->{close_button}; 1554 if $self->{close_button};
1266} 1555}
1267 1556
1268############################################################################# 1557#############################################################################
1269 1558
1270package CFClient::UI::Table; 1559package CFPlus::UI::Table;
1271 1560
1272our @ISA = CFClient::UI::Base::; 1561our @ISA = CFPlus::UI::Container::;
1273 1562
1274use List::Util qw(max sum); 1563use List::Util qw(max sum);
1275 1564
1276use CFClient::OpenGL; 1565use CFPlus::OpenGL;
1277 1566
1278sub new { 1567sub new {
1279 my $class = shift; 1568 my $class = shift;
1280 1569
1281 $class->SUPER::new ( 1570 $class->SUPER::new (
1282 col_expand => [], 1571 col_expand => [],
1572 row_expand => [],
1283 @_, 1573 @_,
1284 ) 1574 )
1285} 1575}
1286 1576
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289}
1290
1291sub add { 1577sub add {
1292 my ($self, $x, $y, $child) = @_; 1578 my ($self, @widgets) = @_;
1293 1579
1294 $child->set_parent ($self); 1580 for my $child (@widgets) {
1295 $self->{children}[$y][$x] = $child; 1581 $child->{rowspan} ||= 1;
1582 $child->{colspan} ||= 1;
1583 }
1296 1584
1297 $self->realloc; 1585 $self->SUPER::add (@widgets);
1298} 1586}
1299 1587
1300sub remove { 1588sub add_at {
1589 my $self = shift;
1590
1591 my @widgets;
1592
1593 while (@_) {
1594 my ($col, $row, $child) = splice @_, 0, 3, ();
1595
1596 $child->{row} = $row;
1597 $child->{col} = $col;
1598
1599 push @widgets, $child;
1600 }
1601
1602 $self->add (@widgets);
1603}
1604
1605sub get_wh {
1301 my ($self, $child) = @_; 1606 my ($self) = @_;
1302 1607
1303 # TODO: not yet implemented 1608 my (@w, @h);
1304}
1305
1306# TODO: move to container class maybe? send children a signal on removal?
1307sub clear {
1308 my ($self) = @_;
1309 1609
1310 my @children = $self->children; 1610 my @children = $self->children;
1311 delete $self->{children}; 1611
1612 # first pass, columns
1613 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1614 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1615
1616 my $sw = sum @w[$c .. $c + $cs - 1];
1617
1618 if ($w > $sw) {
1619 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1620 }
1312 1621 }
1313 for (@children) {
1314 delete $_->{parent};
1315 $_->hide;
1316 }
1317 1622
1318 $self->realloc; 1623 # second pass, rows
1319} 1624 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1320
1321sub get_wh {
1322 my ($self) = @_;
1323
1324 my (@w, @h);
1325
1326 for my $y (0 .. $#{$self->{children}}) {
1327 my $row = $self->{children}[$y]
1328 or next;
1329
1330 for my $x (0 .. $#$row) {
1331 my $widget = $row->[$x]
1332 or next;
1333 my ($w, $h) = @$widget{qw(req_w req_h)}; 1625 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1334 1626
1335 $w[$x] = max $w[$x], $w; 1627 my $sh = sum @h[$r .. $r + $rs - 1];
1336 $h[$y] = max $h[$y], $h; 1628
1629 if ($h > $sh) {
1630 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337 } 1631 }
1338 } 1632 }
1339 1633
1340 (\@w, \@h) 1634 (\@w, \@h)
1341} 1635}
… …
1357 my ($ws, $hs) = $self->get_wh; 1651 my ($ws, $hs) = $self->get_wh;
1358 1652
1359 my $req_w = (sum @$ws) || 1; 1653 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1654 my $req_h = (sum @$hs) || 1;
1361 1655
1362 # TODO: nicer code && do row_expand 1656 # now linearly scale the rows/columns to the allocated size
1363 my @col_expand = @{$self->{col_expand}}; 1657 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1658 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1659 my $col_expand = (sum @col_expand) || 1;
1366 1660
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1661 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1662
1371 CFClient::UI::harmonize $ws; 1663 CFPlus::UI::harmonize $ws;
1664
1665 my @row_expand = @{$self->{row_expand}};
1666 @row_expand = (1) x @$ws unless @row_expand;
1667 my $row_expand = (sum @row_expand) || 1;
1668
1669 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1670
1372 CFClient::UI::harmonize $hs; 1671 CFPlus::UI::harmonize $hs;
1373 1672
1374 my $y; 1673 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1674 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375 1675
1376 for my $r (0 .. $#{$self->{children}}) { 1676 for my $widget ($self->children) {
1377 my $row = $self->{children}[$r] 1677 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1378 or next;
1379 1678
1380 my $x = 0; 1679 $widget->configure (
1381 my $row_h = $hs->[$r]; 1680 $x[$c], $y[$r],
1681 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382 1682 );
1383 for my $c (0 .. $#$row) { 1683 }
1384 my $col_w = $ws->[$c];
1385 1684
1386 if (my $widget = $row->[$c]) { 1685 1
1387 $widget->configure ($x, $y, $col_w, $row_h); 1686}
1388 }
1389 1687
1390 $x += $col_w; 1688#############################################################################
1689
1690package CFPlus::UI::Fixed;
1691
1692use List::Util qw(min max);
1693
1694our @ISA = CFPlus::UI::Container::;
1695
1696sub _scale($$$) {
1697 my ($rel, $val, $max) = @_;
1698
1699 $rel ? $val * $max : $val
1700}
1701
1702sub size_request {
1703 my ($self) = @_;
1704
1705 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1706
1707 # determine overall size by querying abs widgets
1708 for my $child ($self->visible_children) {
1709 unless ($child->{c_rel}) {
1710 my $x = $child->{c_x};
1711 my $y = $child->{c_y};
1712
1713 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1714 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1391 } 1715 }
1716 }
1392 1717
1393 $y += $row_h; 1718 my $W = $x2 - $x1;
1719 my $H = $y2 - $y1;
1720
1721 # now layout remaining widgets
1722 for my $child ($self->visible_children) {
1723 if ($child->{c_rel}) {
1724 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1725 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1726
1727 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1728 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1729 }
1730 }
1731
1732 my $W = $x2 - $x1;
1733 my $H = $y2 - $y1;
1734
1735 ($W, $H)
1736}
1737
1738sub invoke_size_allocate {
1739 my ($self, $W, $H) = @_;
1740
1741 for my $child ($self->visible_children) {
1742 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1743 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1744
1745 $x += $child->{c_halign} * $child->{req_w};
1746 $y += $child->{c_valign} * $child->{req_h};
1747
1748 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1394 } 1749 }
1395 1750
1396 1 1751 1
1397} 1752}
1398 1753
1399sub find_widget {
1400 my ($self, $x, $y) = @_;
1401
1402 $x -= $self->{x};
1403 $y -= $self->{y};
1404
1405 my $res;
1406
1407 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1408 $res = $_->find_widget ($x, $y)
1409 and return $res;
1410 }
1411
1412 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1413}
1414
1415sub _draw {
1416 my ($self) = @_;
1417
1418 for (grep $_, @{$self->{children}}) {
1419 $_->draw for grep $_, @$_;
1420 }
1421}
1422
1423############################################################################# 1754#############################################################################
1424 1755
1425package CFClient::UI::Box; 1756package CFPlus::UI::Box;
1426 1757
1427our @ISA = CFClient::UI::Container::; 1758our @ISA = CFPlus::UI::Container::;
1428 1759
1429sub size_request { 1760sub size_request {
1430 my ($self) = @_; 1761 my ($self) = @_;
1762
1763 my @children = $self->visible_children;
1431 1764
1432 $self->{vertical} 1765 $self->{vertical}
1433 ? ( 1766 ? (
1434 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1767 (List::Util::max map $_->{req_w}, @children),
1435 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1768 (List::Util::sum map $_->{req_h}, @children),
1436 ) 1769 )
1437 : ( 1770 : (
1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_w}, @children),
1439 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1772 (List::Util::max map $_->{req_h}, @children),
1440 ) 1773 )
1441} 1774}
1442 1775
1443sub invoke_size_allocate { 1776sub invoke_size_allocate {
1444 my ($self, $w, $h) = @_; 1777 my ($self, $w, $h) = @_;
… …
1465 $req[$_] += $space * $children[$_]{expand} 1798 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1799 for 0 .. $#children;
1467 } 1800 }
1468 } 1801 }
1469 1802
1470 CFClient::UI::harmonize \@req; 1803 CFPlus::UI::harmonize \@req;
1471 1804
1472 my $pos = 0; 1805 my $pos = 0;
1473 for (0 .. $#children) { 1806 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1807 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1808 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1813 1
1481} 1814}
1482 1815
1483############################################################################# 1816#############################################################################
1484 1817
1485package CFClient::UI::HBox; 1818package CFPlus::UI::HBox;
1486 1819
1487our @ISA = CFClient::UI::Box::; 1820our @ISA = CFPlus::UI::Box::;
1488 1821
1489sub new { 1822sub new {
1490 my $class = shift; 1823 my $class = shift;
1491 1824
1492 $class->SUPER::new ( 1825 $class->SUPER::new (
… …
1495 ) 1828 )
1496} 1829}
1497 1830
1498############################################################################# 1831#############################################################################
1499 1832
1500package CFClient::UI::VBox; 1833package CFPlus::UI::VBox;
1501 1834
1502our @ISA = CFClient::UI::Box::; 1835our @ISA = CFPlus::UI::Box::;
1503 1836
1504sub new { 1837sub new {
1505 my $class = shift; 1838 my $class = shift;
1506 1839
1507 $class->SUPER::new ( 1840 $class->SUPER::new (
… …
1510 ) 1843 )
1511} 1844}
1512 1845
1513############################################################################# 1846#############################################################################
1514 1847
1515package CFClient::UI::Label; 1848package CFPlus::UI::Label;
1516 1849
1517our @ISA = CFClient::UI::DrawBG::; 1850our @ISA = CFPlus::UI::DrawBG::;
1518 1851
1519use CFClient::OpenGL; 1852use CFPlus::OpenGL;
1520 1853
1521sub new { 1854sub new {
1522 my ($class, %arg) = @_; 1855 my ($class, %arg) = @_;
1523 1856
1524 my $self = $class->SUPER::new ( 1857 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1860 #active_bg => none
1528 #font => default_font 1861 #font => default_font
1529 #text => initial text 1862 #text => initial text
1530 #markup => initial narkup 1863 #markup => initial narkup
1531 #max_w => maximum pixel width 1864 #max_w => maximum pixel width
1865 #style => 0, # render flags
1532 ellipsise => 3, # end 1866 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1867 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1868 fontsize => 1,
1535 align => -1, 1869 align => -1,
1536 valign => -1, 1870 valign => -1,
1537 padding_x => 2, 1871 padding_x => 2,
1538 padding_y => 2, 1872 padding_y => 2,
1539 can_events => 0, 1873 can_events => 0,
1540 %arg 1874 %arg
1541 ); 1875 );
1542 1876
1543 if (exists $self->{template}) { 1877 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1878 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1879 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1880 $self->{template} = $layout;
1547 } 1881 }
1548 1882
1549 if (exists $self->{markup}) { 1883 if (exists $self->{markup}) {
… …
1553 } 1887 }
1554 1888
1555 $self 1889 $self
1556} 1890}
1557 1891
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1892sub update {
1569 my ($self) = @_; 1893 my ($self) = @_;
1570 1894
1571 delete $self->{texture}; 1895 delete $self->{texture};
1572 $self->SUPER::update; 1896 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1907 my ($self, $text) = @_;
1584 1908
1585 return if $self->{text} eq "T$text"; 1909 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1910 $self->{text} = "T$text";
1587 1911
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1912 $self->{layout}->set_text ($text);
1590 1913
1591 delete $self->{size_req}; 1914 delete $self->{size_req};
1592 $self->realloc; 1915 $self->realloc;
1593 $self->update; 1916 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1922 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1923 $self->{text} = "M$markup";
1601 1924
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1925 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1926
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1927 $self->{layout}->set_markup ($markup);
1606 1928
1607 delete $self->{size_req}; 1929 delete $self->{size_req};
1608 $self->realloc; 1930 $self->realloc;
1609 $self->update; 1931 $self->update;
… …
1621 1943
1622 my ($w, $h) = $self->{layout}->size; 1944 my ($w, $h) = $self->{layout}->size;
1623 1945
1624 if (exists $self->{template}) { 1946 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1947 $self->{template}->set_font ($self->{font}) if $self->{font};
1948 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1949 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1950
1628 my ($w2, $h2) = $self->{template}->size; 1951 my ($w2, $h2) = $self->{template}->size;
1629 1952
1630 $w = List::Util::max $w, $w2; 1953 $w = List::Util::max $w, $w2;
… …
1654 1977
1655sub set_fontsize { 1978sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1979 my ($self, $fontsize) = @_;
1657 1980
1658 $self->{fontsize} = $fontsize; 1981 $self->{fontsize} = $fontsize;
1982 delete $self->{size_req};
1659 delete $self->{texture}; 1983 delete $self->{texture};
1660 1984
1661 $self->realloc; 1985 $self->realloc;
1662} 1986}
1663 1987
1664sub reconfigure { 1988sub reconfigure {
1665 my ($self) = @_; 1989 my ($self) = @_;
1666 1990
1667 delete $self->{size_req}; 1991 delete $self->{size_req};
1992 delete $self->{texture};
1668 1993
1669 $self->SUPER::reconfigure; 1994 $self->SUPER::reconfigure;
1670} 1995}
1671 1996
1672sub _draw { 1997sub _draw {
1673 my ($self) = @_; 1998 my ($self) = @_;
1674 1999
1675 $self->SUPER::_draw; # draw background, if applicable 2000 $self->SUPER::_draw; # draw background, if applicable
1676 2001
1677 my $tex = $self->{texture} ||= do { 2002 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 2003 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2004 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 2005 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2006 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2007 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2008 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 2009
1685 new_from_layout CFClient::Texture $self->{layout} 2010 [$self->{layout}->size]
1686 }; 2011 };
1687 2012
1688 unless (exists $self->{ox}) { 2013 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2014 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2015 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 2016 : ($self->{w} - $size->[0]) * 0.5);
1692 2017
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2018 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2019 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 2020 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 2021 };
1697 2022
1698 glEnable GL_TEXTURE_2D; 2023# unless ($self->{list}) {
1699 2024# $self->{list} = CFPlus::OpenGL::glGenList;
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2025# CFPlus::OpenGL::glNewList $self->{list};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2026# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702 2027# CFPlus::OpenGL::glEndList;
1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 } 2028# }
2029#
2030# CFPlus::OpenGL::glCallList $self->{list};
1711 2031
1712 glDisable GL_TEXTURE_2D; 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713} 2033}
2034
2035#sub destroy {
2036# my ($self) = @_;
2037#
2038# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2039#
2040# $self->SUPER::destroy;
2041#}
1714 2042
1715############################################################################# 2043#############################################################################
1716 2044
1717package CFClient::UI::EntryBase; 2045package CFPlus::UI::EntryBase;
1718 2046
1719our @ISA = CFClient::UI::Label::; 2047our @ISA = CFPlus::UI::Label::;
1720 2048
1721use CFClient::OpenGL; 2049use CFPlus::OpenGL;
1722 2050
1723sub new { 2051sub new {
1724 my $class = shift; 2052 my $class = shift;
1725 2053
1726 $class->SUPER::new ( 2054 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 2058 active_fg => [0, 0, 0],
1731 can_hover => 1, 2059 can_hover => 1,
1732 can_focus => 1, 2060 can_focus => 1,
1733 valign => 0, 2061 valign => 0,
1734 can_events => 1, 2062 can_events => 1,
2063 ellipsise => 0,
1735 #text => ... 2064 #text => ...
1736 #hidden => "*", 2065 #hidden => "*",
1737 @_ 2066 @_
1738 ) 2067 )
1739} 2068}
… …
1784 my $sym = $ev->{sym}; 2113 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2114 my $uni = $ev->{unicode};
1786 2115
1787 my $text = $self->get_text; 2116 my $text = $self->get_text;
1788 2117
2118 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2119
1789 if ($uni == 8) { 2120 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2121 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2122 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2123 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2124 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2125 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2126 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2127 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 2128 } elsif ($sym == CFPlus::SDLK_HOME) {
2129 # what a hack
2130 $self->{cursor} =
2131 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2132 ? length $1
2133 : 0;
2134 } elsif ($sym == CFPlus::SDLK_END) {
2135 # uh, again
2136 $self->{cursor} =
2137 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2138 ? $self->{cursor} + length $1
2139 : length $self->{text};
2140 } elsif ($uni == 21) { # ctrl-u
2141 $text = "";
1798 $self->{cursor} = 0; 2142 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2143 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2144 $self->emit ('escape');
1803 } elsif ($uni) { 2145 } elsif ($uni == 0x0d) {
2146 substr $text, $self->{cursor}++, 0, "\012";
2147 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2148 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2149 } else {
1806 return 0; 2150 return 0;
1807 } 2151 }
1808 2152
1809 $self->_set_text ($text); 2153 $self->_set_text ($text);
1810 2154
1811 $self->realloc; 2155 $self->realloc;
2156 $self->update;
1812 2157
1813 1 2158 1
1814} 2159}
1815 2160
1816sub invoke_focus_in { 2161sub invoke_focus_in {
… …
1828 2173
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2174 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2175
1831 # byte-index to char-index 2176 # byte-index to char-index
1832 my $text = $self->{text}; 2177 my $text = $self->{text};
1833 utf8::encode $text; 2178 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2179 $self->{cursor} = length $text;
1835 2180
1836 $self->_set_text ($self->{text}); 2181 $self->_set_text ($self->{text});
1837 $self->update; 2182 $self->update;
1838 2183
1839 1 2184 1
… …
1878 utf8::encode $text; 2223 utf8::encode $text;
1879 2224
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2225 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2226 }
1882 2227
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2228 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2229 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2230 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2231 glEnd;
1888 } 2232 }
1889} 2233}
1890 2234
2235#############################################################################
2236
1891package CFClient::UI::Entry; 2237package CFPlus::UI::Entry;
1892 2238
1893our @ISA = CFClient::UI::EntryBase::; 2239our @ISA = CFPlus::UI::EntryBase::;
1894 2240
1895use CFClient::OpenGL; 2241use CFPlus::OpenGL;
1896 2242
1897sub invoke_key_down { 2243sub invoke_key_down {
1898 my ($self, $ev) = @_; 2244 my ($self, $ev) = @_;
1899 2245
1900 my $sym = $ev->{sym}; 2246 my $sym = $ev->{sym};
1901 2247
1902 if ($sym == 13) { 2248 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2249 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2250 my $txt = $self->get_text;
1905 2251
1906 $self->{history_pointer} = -1; 2252 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2253 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2254 $self->emit (activate => $txt);
1909 $self->update; 2255 $self->update;
1910 2256
1911 } elsif ($sym == CFClient::SDLK_UP) { 2257 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2258 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2259 $self->{history_saveback} = $self->get_text;
1914 } 2260 }
1915 if (@{$self->{history} || []} > 0) { 2261 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2262 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2264 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2265 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2267 }
1922 2268
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2269 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2270 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2271 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2272
1927 if ($self->{history_pointer} >= 0) { 2273 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2274 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2283 1
1938} 2284}
1939 2285
1940############################################################################# 2286#############################################################################
1941 2287
2288package CFPlus::UI::TextEdit;
2289
2290our @ISA = CFPlus::UI::EntryBase::;
2291
2292use CFPlus::OpenGL;
2293
2294sub move_cursor_ver {
2295 my ($self, $dy) = @_;
2296
2297 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2298
2299 $y += $dy;
2300
2301 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2302 $self->{cursor} = $index;
2303 delete $self->{cur_h};
2304 $self->update;
2305 return;
2306 }
2307}
2308
2309sub invoke_key_down {
2310 my ($self, $ev) = @_;
2311
2312 my $sym = $ev->{sym};
2313
2314 if ($sym == CFPlus::SDLK_UP) {
2315 $self->move_cursor_ver (-1);
2316 } elsif ($sym == CFPlus::SDLK_DOWN) {
2317 $self->move_cursor_ver (+1);
2318 } else {
2319 return $self->SUPER::invoke_key_down ($ev)
2320 }
2321
2322 1
2323}
2324
2325#############################################################################
2326
1942package CFClient::UI::Button; 2327package CFPlus::UI::Button;
1943 2328
1944our @ISA = CFClient::UI::Label::; 2329our @ISA = CFPlus::UI::Label::;
1945 2330
1946use CFClient::OpenGL; 2331use CFPlus::OpenGL;
1947 2332
1948my @tex = 2333my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2334 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2335 qw(b1_button_inactive.png b1_button_active.png);
1951 2336
1952sub new { 2337sub new {
1953 my $class = shift; 2338 my $class = shift;
1954 2339
1955 $class->SUPER::new ( 2340 $class->SUPER::new (
1956 padding_x => 4, 2341 padding_x => 4,
1957 padding_y => 4, 2342 padding_y => 4,
1958 fg => [1, 1, 1], 2343 fg => [1.0, 1.0, 1.0],
1959 active_fg => [0, 0, 1], 2344 active_fg => [0.8, 0.8, 0.8],
1960 can_hover => 1, 2345 can_hover => 1,
1961 align => 0, 2346 align => 0,
1962 valign => 0, 2347 valign => 0,
1963 can_events => 1, 2348 can_events => 1,
1964 @_ 2349 @_
… …
1982 2367
1983 glEnable GL_TEXTURE_2D; 2368 glEnable GL_TEXTURE_2D;
1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2369 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985 glColor 0, 0, 0, 1; 2370 glColor 0, 0, 0, 1;
1986 2371
2372 my $tex = $tex[$GRAB == $self];
1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2373 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988 2374
1989 glDisable GL_TEXTURE_2D; 2375 glDisable GL_TEXTURE_2D;
1990 2376
1991 $self->SUPER::_draw; 2377 $self->SUPER::_draw;
1992} 2378}
1993 2379
1994############################################################################# 2380#############################################################################
1995 2381
2382package CFPlus::UI::CheckBox;
2383
2384our @ISA = CFPlus::UI::DrawBG::;
2385
2386my @tex =
2387 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2388 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2389
2390use CFPlus::OpenGL;
2391
2392sub new {
2393 my $class = shift;
2394
2395 $class->SUPER::new (
2396 padding_x => 2,
2397 padding_y => 2,
2398 fg => [1, 1, 1],
2399 active_fg => [1, 1, 0],
2400 bg => [0, 0, 0, 0.2],
2401 active_bg => [1, 1, 1, 0.5],
2402 state => 0,
2403 can_hover => 1,
2404 @_
2405 )
2406}
2407
2408sub size_request {
2409 my ($self) = @_;
2410
2411 (6) x 2
2412}
2413
2414sub toggle {
2415 my ($self) = @_;
2416
2417 $self->{state} = !$self->{state};
2418 $self->emit (changed => $self->{state});
2419 $self->update;
2420}
2421
2422sub invoke_button_down {
2423 my ($self, $ev, $x, $y) = @_;
2424
2425 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2426 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2427 $self->toggle;
2428 } else {
2429 return 0
2430 }
2431
2432 1
2433}
2434
2435sub _draw {
2436 my ($self) = @_;
2437
2438 $self->SUPER::_draw;
2439
2440 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2441
2442 my ($w, $h) = @$self{qw(w h)};
2443
2444 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2445
2446 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2447
2448 my $tex = $self->{state} ? $tex[1] : $tex[0];
2449
2450 glEnable GL_TEXTURE_2D;
2451 $tex->draw_quad_alpha (0, 0, $s, $s);
2452 glDisable GL_TEXTURE_2D;
2453}
2454
2455#############################################################################
2456
2457package CFPlus::UI::Image;
2458
2459our @ISA = CFPlus::UI::Base::;
2460
2461use CFPlus::OpenGL;
2462
2463our %texture_cache;
2464
2465sub new {
2466 my $class = shift;
2467
2468 my $self = $class->SUPER::new (
2469 can_events => 0,
2470 @_,
2471 );
2472
2473 $self->{path} || $self->{tex}
2474 or Carp::croak "'path' or 'tex' attributes required";
2475
2476 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2477 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2478
2479 CFPlus::weaken $texture_cache{$self->{path}};
2480
2481 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2482
2483 $self
2484}
2485
2486sub STORABLE_freeze {
2487 my ($self, $cloning) = @_;
2488
2489 $self->{path}
2490 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2491
2492 $self->{path}
2493}
2494
2495sub STORABLE_attach {
2496 my ($self, $cloning, $path) = @_;
2497
2498 $self->new (path => $path)
2499}
2500
2501sub size_request {
2502 my ($self) = @_;
2503
2504 ($self->{tex}{w}, $self->{tex}{h})
2505}
2506
2507sub _draw {
2508 my ($self) = @_;
2509
2510 my $tex = $self->{tex};
2511
2512 my ($w, $h) = ($self->{w}, $self->{h});
2513
2514 if ($self->{rot90}) {
2515 glRotate 90, 0, 0, 1;
2516 glTranslate 0, -$self->{w}, 0;
2517
2518 ($w, $h) = ($h, $w);
2519 }
2520
2521 glEnable GL_TEXTURE_2D;
2522 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2523
2524 $tex->draw_quad (0, 0, $w, $h);
2525
2526 glDisable GL_TEXTURE_2D;
2527}
2528
2529#############################################################################
2530
1996package CFClient::UI::ImageButton; 2531package CFPlus::UI::ImageButton;
1997 2532
1998our @ISA = CFClient::UI::Image::; 2533our @ISA = CFPlus::UI::Image::;
1999 2534
2000use CFClient::OpenGL; 2535use CFPlus::OpenGL;
2001 2536
2002my %textures; 2537my %textures;
2003 2538
2004sub new { 2539sub new {
2005 my $class = shift; 2540 my $class = shift;
… …
2027 1 2562 1
2028} 2563}
2029 2564
2030############################################################################# 2565#############################################################################
2031 2566
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_;
2066
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state};
2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
2075 1
2076}
2077
2078sub _draw {
2079 my ($self) = @_;
2080
2081 $self->SUPER::_draw;
2082
2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093 glEnable GL_TEXTURE_2D;
2094 $tex->draw_quad_alpha (0, 0, $s, $s);
2095 glDisable GL_TEXTURE_2D;
2096}
2097
2098#############################################################################
2099
2100package CFClient::UI::Image; 2567package CFPlus::UI::VGauge;
2101 2568
2102our @ISA = CFClient::UI::Base::; 2569our @ISA = CFPlus::UI::Base::;
2103
2104use CFClient::OpenGL;
2105
2106our %texture_cache;
2107
2108sub new {
2109 my $class = shift;
2110
2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2115
2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2118
2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126 $self
2127}
2128
2129sub size_request {
2130 my ($self) = @_;
2131
2132 ($self->{tex}{w}, $self->{tex}{h})
2133}
2134
2135sub _draw {
2136 my ($self) = @_;
2137
2138 my $tex = $self->{tex};
2139
2140 my ($w, $h) = ($self->{w}, $self->{h});
2141
2142 if ($self->{rot90}) {
2143 glRotate 90, 0, 0, 1;
2144 glTranslate 0, -$self->{w}, 0;
2145
2146 ($w, $h) = ($h, $w);
2147 }
2148
2149 glEnable GL_TEXTURE_2D;
2150 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152 $tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154 glDisable GL_TEXTURE_2D;
2155}
2156
2157#############################################################################
2158
2159package CFClient::UI::VGauge;
2160
2161our @ISA = CFClient::UI::Base::;
2162 2570
2163use List::Util qw(min max); 2571use List::Util qw(min max);
2164 2572
2165use CFClient::OpenGL; 2573use CFPlus::OpenGL;
2166 2574
2167my %tex = ( 2575my %tex = (
2168 food => [ 2576 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2577 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2578 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2579 ],
2172 grace => [ 2580 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2581 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2582 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2583 ],
2176 hp => [ 2584 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2585 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2586 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2587 ],
2180 mana => [ 2588 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2589 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2590 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2591 ],
2184); 2592);
2185 2593
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2594# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2654 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2655 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2656
2249 my $h1 = $self->{h} * (1 - $ycut1); 2657 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2658 my $h2 = $self->{h} * (1 - $ycut2);
2659 my $h3 = $self->{h};
2660
2661 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2662
2252 glEnable GL_BLEND; 2663 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2664 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2665 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2666 glEnable GL_TEXTURE_2D;
… …
2274 2685
2275 if ($t3) { 2686 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2687 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2688 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2689 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2690 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2691 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2692 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2693 glEnd;
2283 } 2694 }
2284 2695
2285 glDisable GL_BLEND; 2696 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2697 glDisable GL_TEXTURE_2D;
2287} 2698}
2288 2699
2289############################################################################# 2700#############################################################################
2290 2701
2291package CFClient::UI::Gauge; 2702package CFPlus::UI::Gauge;
2292 2703
2293our @ISA = CFClient::UI::VBox::; 2704our @ISA = CFPlus::UI::VBox::;
2294 2705
2295sub new { 2706sub new {
2296 my ($class, %arg) = @_; 2707 my ($class, %arg) = @_;
2297 2708
2298 my $self = $class->SUPER::new ( 2709 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2711 can_hover => 1,
2301 can_events => 1, 2712 can_events => 1,
2302 %arg, 2713 %arg,
2303 ); 2714 );
2304 2715
2305 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2716 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2717 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2718 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308 2719
2309 $self 2720 $self
2310} 2721}
2311 2722
2312sub set_fontsize { 2723sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2744 $self->{value}->set_text ($val);
2334} 2745}
2335 2746
2336############################################################################# 2747#############################################################################
2337 2748
2338package CFClient::UI::Slider; 2749package CFPlus::UI::Slider;
2339 2750
2340use strict; 2751use strict;
2341 2752
2342use CFClient::OpenGL; 2753use CFPlus::OpenGL;
2343 2754
2344our @ISA = CFClient::UI::DrawBG::; 2755our @ISA = CFPlus::UI::DrawBG::;
2345 2756
2346my @tex = 2757my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2758 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2759 qw(s1_slider.png s1_slider_bg.png);
2349 2760
2350sub new { 2761sub new {
2351 my $class = shift; 2762 my $class = shift;
2352 2763
… …
2420 2831
2421 $self->SUPER::invoke_button_down ($ev, $x, $y); 2832 $self->SUPER::invoke_button_down ($ev, $x, $y);
2422 2833
2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2834 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2424 2835
2425 $self->invoke_mouse_motion ($ev, $x, $y) 2836 $self->invoke_mouse_motion ($ev, $x, $y);
2837
2838 1
2426} 2839}
2427 2840
2428sub invoke_mouse_motion { 2841sub invoke_mouse_motion {
2429 my ($self, $ev, $x, $y) = @_; 2842 my ($self, $ev, $x, $y) = @_;
2430 2843
… …
2437 2850
2438 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2851 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439 } else { 2852 } else {
2440 return 0; 2853 return 0;
2441 } 2854 }
2855
2856 1
2857}
2858
2859sub invoke_mouse_wheel {
2860 my ($self, $ev) = @_;
2861
2862 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2863
2864 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2865
2866 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2442 2867
2443 1 2868 1
2444} 2869}
2445 2870
2446sub update { 2871sub update {
… …
2497 glDisable GL_TEXTURE_2D; 2922 glDisable GL_TEXTURE_2D;
2498} 2923}
2499 2924
2500############################################################################# 2925#############################################################################
2501 2926
2502package CFClient::UI::ValSlider; 2927package CFPlus::UI::ValSlider;
2503 2928
2504our @ISA = CFClient::UI::HBox::; 2929our @ISA = CFPlus::UI::HBox::;
2505 2930
2506sub new { 2931sub new {
2507 my ($class, %arg) = @_; 2932 my ($class, %arg) = @_;
2508 2933
2509 my $range = delete $arg{range}; 2934 my $range = delete $arg{range};
2510 2935
2511 my $self = $class->SUPER::new ( 2936 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2937 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2938 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 2939 to_value => sub { shift },
2515 from_value => sub { shift }, 2940 from_value => sub { shift },
2516 %arg, 2941 %arg,
2517 ); 2942 );
2518 2943
… …
2538sub set_range { shift->{slider}->set_range (@_) } 2963sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 2964sub set_value { shift->{slider}->set_value (@_) }
2540 2965
2541############################################################################# 2966#############################################################################
2542 2967
2543package CFClient::UI::TextScroller; 2968package CFPlus::UI::TextScroller;
2544 2969
2545our @ISA = CFClient::UI::HBox::; 2970our @ISA = CFPlus::UI::HBox::;
2546 2971
2547use CFClient::OpenGL; 2972use CFPlus::OpenGL;
2548 2973
2549sub new { 2974sub new {
2550 my $class = shift; 2975 my $class = shift;
2551 2976
2552 my $self = $class->SUPER::new ( 2977 my $self = $class->SUPER::new (
2553 fontsize => 1, 2978 fontsize => 1,
2554 can_events => 0, 2979 can_events => 1,
2555 indent => 0, 2980 indent => 0,
2556 #font => default_font 2981 #font => default_font
2557 @_, 2982 @_,
2558 2983
2559 layout => (new CFClient::Layout 1), 2984 layout => (new CFPlus::Layout),
2560 par => [], 2985 par => [],
2986 max_par => 0,
2561 height => 0, 2987 height => 0,
2562 children => [ 2988 children => [
2563 (new CFClient::UI::Empty expand => 1), 2989 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2990 (new CFPlus::UI::Slider vertical => 1),
2565 ], 2991 ],
2566 ); 2992 );
2567 2993
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 2994 $self->{children}[1]->connect (changed => sub { $self->update });
2569 2995
… …
2578} 3004}
2579 3005
2580sub size_request { 3006sub size_request {
2581 my ($self) = @_; 3007 my ($self) = @_;
2582 3008
2583 my ($empty, $slider) = @{ $self->{children} }; 3009 my ($empty, $slider) = $self->visible_children;
2584 3010
2585 local $self->{children} = [$empty, $slider]; 3011 local $self->{children} = [$empty, $slider];
2586 $self->SUPER::size_request 3012 $self->SUPER::size_request
2587} 3013}
2588 3014
… …
2599 3025
2600 $self->reflow; 3026 $self->reflow;
2601 3027
2602 local $self->{children} = [$empty, $slider]; 3028 local $self->{children} = [$empty, $slider];
2603 $self->SUPER::invoke_size_allocate ($w, $h) 3029 $self->SUPER::invoke_size_allocate ($w, $h)
3030}
3031
3032sub invoke_mouse_wheel {
3033 my ($self, $ev) = @_;
3034
3035 return 0 unless $ev->{dy}; # only vertical movements
3036
3037 $self->{children}[1]->emit (mouse_wheel => $ev);
3038
3039 1
2604} 3040}
2605 3041
2606sub get_layout { 3042sub get_layout {
2607 my ($self, $para) = @_; 3043 my ($self, $para) = @_;
2608 3044
… …
2636 3072
2637 # todo: base offset on lines or so, not on pixels 3073 # todo: base offset on lines or so, not on pixels
2638 $self->{children}[1]->set_value ($offset); 3074 $self->{children}[1]->set_value ($offset);
2639} 3075}
2640 3076
3077sub current_paragraph {
3078 my ($self) = @_;
3079
3080 $self->{top_paragraph} - 1
3081}
3082
3083sub scroll_to {
3084 my ($self, $para) = @_;
3085
3086 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3087
3088 $self->{scroll_to} = $para;
3089 $self->update;
3090}
3091
2641sub clear { 3092sub clear {
2642 my ($self) = @_; 3093 my ($self) = @_;
2643 3094
2644 my (undef, undef, @other) = @{ $self->{children} }; 3095 my (undef, undef, @other) = @{ $self->{children} };
2645 $self->remove ($_) for @other; 3096 $self->remove ($_) for @other;
… …
2648 $self->{height} = 0; 3099 $self->{height} = 0;
2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3100 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2650} 3101}
2651 3102
2652sub add_paragraph { 3103sub add_paragraph {
2653 my ($self, $color, $para, $indent) = @_; 3104 my $self = shift;
2654 3105
2655 my ($text, @w) = ref $para ? @$para : $para; 3106 for my $para (@_) {
2656
2657 $para = { 3107 $para = {
3108 fg => [1, 1, 1, 1],
3109 indent => 0,
3110 markup => "",
3111 widget => [],
3112 ref $para ? %$para : (markup => $para),
2658 w => 1e10, 3113 w => 1e10,
2659 wrapped => 1, 3114 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2664 }; 3115 };
2665 3116
2666 $self->add (@w) if @w; 3117 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2667 push @{$self->{par}}, $para; 3118 push @{$self->{par}}, $para;
3119 }
3120
3121 if (my $max = $self->{max_par}) {
3122 shift @{$self->{par}} while @{$self->{par}} > $max;
3123 }
2668 3124
2669 $self->{need_reflow}++; 3125 $self->{need_reflow}++;
2670 $self->update; 3126 $self->update;
2671} 3127}
2672 3128
2673sub scroll_to_bottom { 3129sub scroll_to_bottom {
2674 my ($self) = @_; 3130 my ($self) = @_;
2675 3131
2676 $self->{scroll_to_bottom} = 1; 3132 $self->{scroll_to} = $#{$self->{par}};
2677 $self->update; 3133 $self->update;
2678} 3134}
2679 3135
3136sub force_uptodate {
3137 my ($self) = @_;
3138
3139 if (delete $self->{need_reflow}) {
3140 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3141
3142 my $height = 0;
3143
3144 for my $para (@{$self->{par}}) {
3145 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3146 my $layout = $self->get_layout ($para);
3147 my ($w, $h) = $layout->size;
3148
3149 $para->{w} = $w + $para->{indent};
3150 $para->{h} = $h;
3151 $para->{wrapped} = $layout->has_wrapped;
3152 }
3153
3154 $para->{y} = $height;
3155 $height += $para->{h};
3156 }
3157
3158 $self->{height} = $height;
3159 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3160
3161 delete $self->{texture};
3162 }
3163
3164 if (my $paridx = delete $self->{scroll_to}) {
3165 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3166 }
3167}
3168
2680sub update { 3169sub update {
2681 my ($self) = @_; 3170 my ($self) = @_;
2682 3171
2683 $self->SUPER::update; 3172 $self->SUPER::update;
2684 3173
2685 return unless $self->{h} > 0; 3174 return unless $self->{h} > 0;
2686 3175
2687 delete $self->{texture}; 3176 delete $self->{texture};
2688 3177
2689 $ROOT->on_post_alloc ($self => sub { 3178 $ROOT->on_post_alloc ($self => sub {
3179 $self->force_uptodate;
3180
2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3181 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2691 3182
2692 if (delete $self->{need_reflow}) {
2693 my $height = 0;
2694
2695 for my $para (@{$self->{par}}) {
2696 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2697 my $layout = $self->get_layout ($para);
2698 my ($w, $h) = $layout->size;
2699
2700 $para->{w} = $w + $para->{indent};
2701 $para->{h} = $h;
2702 $para->{wrapped} = $layout->has_wrapped;
2703 }
2704
2705 $height += $para->{h};
2706 }
2707
2708 $self->{height} = $height;
2709
2710 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2711
2712 delete $self->{texture};
2713 }
2714
2715 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10);
2717 }
2718
2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3183 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2720 glClearColor 0, 0, 0, 0; 3184 glClearColor 0, 0, 0, 0;
2721 glClear GL_COLOR_BUFFER_BIT; 3185 glClear GL_COLOR_BUFFER_BIT;
2722 3186
3187 package CFPlus::UI::Base;
3188 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3189 (0, 0, $self->{w}, $self->{h});
3190
3191 my $top = int $self->{children}[1]{range}[0];
3192
3193 my $paridx = 0;
3194 my $top_paragraph;
2723 my $top = int $self->{children}[1]{range}[0]; 3195 my $top = int $self->{children}[1]{range}[0];
2724 3196
2725 my $y0 = $top; 3197 my $y0 = $top;
2726 my $y1 = $top + $H; 3198 my $y1 = $top + $H;
2727 3199
2728 my $y = 0;
2729
2730 glEnable GL_BLEND;
2731 #TODO# not correct in windows where rgba is forced off
2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2733
2734 for my $para (@{$self->{par}}) { 3200 for my $para (@{$self->{par}}) {
2735 my $h = $para->{h}; 3201 my $h = $para->{h};
3202 my $y = $para->{y};
2736 3203
2737 if ($y0 < $y + $h && $y < $y1) { 3204 if ($y0 < $y + $h && $y < $y1) {
2738
2739 my $layout = $self->get_layout ($para); 3205 my $layout = $self->get_layout ($para);
2740 3206
2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743 glRasterPos $para->{indent}, $y - $y0; 3207 $layout->render ($para->{indent}, $y - $y0);
2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745 3208
2746 if (my @w = @{ $para->{widget} }) { 3209 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes; 3210 my @s = $layout->get_shapes;
2748 3211
2749 glDisable GL_BLEND;
2750 for (@w) { 3212 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, (); 3213 my ($dx, $dy) = splice @s, 0, 2, ();
2752 3214
2753 $_->{x} = $dx + $para->{indent}; 3215 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0; 3216 $_->{y} = $dy + $y - $y0;
2755 3217
2756 $_->draw; 3218 $_->draw;
2757 } 3219 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 } 3220 }
2761 } 3221 }
2762 3222
2763 $y += $h; 3223 $paridx++;
3224 $top_paragraph ||= $paridx if $y >= $top;
2764 } 3225 }
2765 3226
2766 glDisable GL_BLEND; 3227 $self->{top_paragraph} = $top_paragraph;
2767 }; 3228 };
2768 }); 3229 });
2769} 3230}
2770 3231
2771sub reconfigure { 3232sub reconfigure {
… …
2789 $self->{children}[1]->draw; 3250 $self->{children}[1]->draw;
2790} 3251}
2791 3252
2792############################################################################# 3253#############################################################################
2793 3254
2794package CFClient::UI::Animator; 3255package CFPlus::UI::Animator;
2795 3256
2796use CFClient::OpenGL; 3257use CFPlus::OpenGL;
2797 3258
2798our @ISA = CFClient::UI::Bin::; 3259our @ISA = CFPlus::UI::Bin::;
2799 3260
2800sub moveto { 3261sub moveto {
2801 my ($self, $x, $y) = @_; 3262 my ($self, $x, $y) = @_;
2802 3263
2803 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3264 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2831 glPopMatrix; 3292 glPopMatrix;
2832} 3293}
2833 3294
2834############################################################################# 3295#############################################################################
2835 3296
2836package CFClient::UI::Flopper; 3297package CFPlus::UI::Flopper;
2837 3298
2838our @ISA = CFClient::UI::Button::; 3299our @ISA = CFPlus::UI::Button::;
2839 3300
2840sub new { 3301sub new {
2841 my $class = shift; 3302 my $class = shift;
2842 3303
2843 my $self = $class->SUPER::new ( 3304 my $self = $class->SUPER::new (
… …
2855 $self->{other}->toggle_visibility; 3316 $self->{other}->toggle_visibility;
2856} 3317}
2857 3318
2858############################################################################# 3319#############################################################################
2859 3320
2860package CFClient::UI::Tooltip; 3321package CFPlus::UI::Tooltip;
2861 3322
2862our @ISA = CFClient::UI::Bin::; 3323our @ISA = CFPlus::UI::Bin::;
2863 3324
2864use CFClient::OpenGL; 3325use CFPlus::OpenGL;
2865 3326
2866sub new { 3327sub new {
2867 my $class = shift; 3328 my $class = shift;
2868 3329
2869 $class->SUPER::new ( 3330 $class->SUPER::new (
… …
2872 ) 3333 )
2873} 3334}
2874 3335
2875sub set_tooltip_from { 3336sub set_tooltip_from {
2876 my ($self, $widget) = @_; 3337 my ($self, $widget) = @_;
3338
3339 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3340 if $widget->{tooltip} =~ /^#(.*)$/;
2877 3341
2878 my $tooltip = $widget->{tooltip}; 3342 my $tooltip = $widget->{tooltip};
2879 3343
2880 if ($ENV{CFPLUS_DEBUG} & 2) { 3344 if ($ENV{CFPLUS_DEBUG} & 2) {
2881 $tooltip .= "\n\n" . (ref $widget) . "\n" 3345 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2885 } 3349 }
2886 3350
2887 $tooltip =~ s/^\n+//; 3351 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//; 3352 $tooltip =~ s/\n+$//;
2889 3353
2890 $self->add (new CFClient::UI::Label 3354 $self->add (new CFPlus::UI::Label
2891 markup => $tooltip, 3355 markup => $tooltip,
2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3356 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2893 fontsize => 0.8, 3357 fontsize => 0.8,
2894 fg => [0, 0, 0, 1], 3358 style => 1, # FLAG_INVERSE
2895 ellipsise => 0, 3359 ellipsise => 0,
2896 font => ($widget->{tooltip_font} || $::FONT_PROP), 3360 font => ($widget->{tooltip_font} || $::FONT_PROP),
2897 ); 3361 );
2898} 3362}
2899 3363
… …
2918 3382
2919 $self->{root}->on_post_alloc ("move_$self" => sub { 3383 $self->{root}->on_post_alloc ("move_$self" => sub {
2920 my $widget = $self->{owner} 3384 my $widget = $self->{owner}
2921 or return; 3385 or return;
2922 3386
3387 if ($widget->{visible}) {
2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3388 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924 3389
2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3390 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926 if $x + $self->{w} > $self->{root}{w}; 3391 if $x + $self->{w} > $self->{root}{w};
2927 3392
2928 $self->move_abs ($x, $y); 3393 $self->move_abs ($x, $y);
3394 } else {
3395 $self->hide;
3396 }
2929 }); 3397 });
2930} 3398}
2931 3399
2932sub _draw { 3400sub _draw {
2933 my ($self) = @_; 3401 my ($self) = @_;
… …
2957 $self->SUPER::_draw; 3425 $self->SUPER::_draw;
2958} 3426}
2959 3427
2960############################################################################# 3428#############################################################################
2961 3429
2962package CFClient::UI::Face; 3430package CFPlus::UI::Face;
2963 3431
2964our @ISA = CFClient::UI::Base::; 3432our @ISA = CFPlus::UI::DrawBG::;
2965 3433
2966use CFClient::OpenGL; 3434use CFPlus::OpenGL;
2967 3435
2968sub new { 3436sub new {
2969 my $class = shift; 3437 my $class = shift;
2970 3438
2971 my $self = $class->SUPER::new ( 3439 my $self = $class->SUPER::new (
3440 size_w => 32,
3441 size_h => 8,
2972 aspect => 1, 3442 aspect => 1,
2973 can_events => 0, 3443 can_events => 0,
2974 @_, 3444 @_,
2975 ); 3445 );
2976 3446
2977 if ($self->{anim} && $self->{animspeed}) { 3447 if ($self->{anim} && $self->{animspeed}) {
2978 Scalar::Util::weaken (my $widget = $self); 3448 CFPlus::weaken (my $widget = $self);
2979 3449
3450 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3451 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2980 $self->{timer} = Event->timer ( 3452 $self->{timer} = Event->timer (
2981 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2982 hard => 1, 3453 parked => 1,
2983 interval => $self->{animspeed},
2984 cb => sub { 3454 cb => sub {
3455 return unless $::CONN && $widget;
3456
2985 ++$widget->{frame}; 3457 ++$widget->{frame};
3458 $widget->update_face;
2986 $widget->update; 3459 $widget->update;
3460
3461 $widget->update_timer;
2987 }, 3462 },
2988 ); 3463 );
3464
3465 $self->update_face;
3466 $self->update_timer;
2989 } 3467 }
2990 3468
2991 $self 3469 $self
2992} 3470}
2993 3471
3472sub update_timer {
3473 my ($self) = @_;
3474
3475 return unless $self->{timer};
3476
3477 if ($self->{visible}) {
3478 $self->{timer}->at (
3479 $self->{anim_start}
3480 + $self->{animspeed}
3481 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3482 );
3483 $self->{timer}->start;
3484 } else {
3485 $self->{timer}->stop;
3486 }
3487}
3488
3489sub update_face {
3490 my ($self) = @_;
3491
3492 return unless $::CONN;
3493
3494 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3495 if ($anim && @$anim) {
3496 delete $self->{wait_face};
3497 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3498 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3499 }
3500 }
3501}
3502
2994sub size_request { 3503sub size_request {
2995 (32, 8) 3504 my ($self) = @_;
3505
3506 if ($::CONN) {
3507 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3508 if (my $tex = $::CONN->{texture}[$faceid]) {
3509 $self->{tex} = $tex;
3510 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3511 } else {
3512 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3513 $self->realloc;
3514 });
3515 }
3516 }
3517 }
3518
3519 ($self->{size_w} || 8, $self->{size_h} || 8)
2996} 3520}
2997 3521
2998sub update { 3522sub update {
2999 my ($self) = @_; 3523 my ($self) = @_;
3000 3524
3001 return unless $self->{visible}; 3525 return unless $self->{visible};
3002 3526
3003 $self->SUPER::update; 3527 $self->SUPER::update;
3004} 3528}
3005 3529
3530sub invoke_visibility_change {
3531 my ($self) = @_;
3532
3533 $self->update_timer;
3534
3535 0
3536}
3537
3006sub _draw { 3538sub _draw {
3007 my ($self) = @_; 3539 my ($self) = @_;
3008 3540
3009 return unless $::CONN; 3541 $self->SUPER::_draw;
3010 3542
3011 my $face; 3543 if (my $tex = $self->{tex}) {
3012
3013 if ($self->{frame}) {
3014 my $anim = $::CONN->{anim}[$self->{anim}];
3015
3016 $face = $anim->[ $self->{frame} % @$anim ]
3017 if $anim && @$anim;
3018 }
3019
3020 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3021
3022 if ($tex) {
3023 glEnable GL_TEXTURE_2D; 3544 glEnable GL_TEXTURE_2D;
3024 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3545 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3025 glColor 0, 0, 0, 1; 3546 glColor 0, 0, 0, 1;
3026 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3547 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3027 glDisable GL_TEXTURE_2D; 3548 glDisable GL_TEXTURE_2D;
… …
3029} 3550}
3030 3551
3031sub destroy { 3552sub destroy {
3032 my ($self) = @_; 3553 my ($self) = @_;
3033 3554
3034 $self->{timer}->cancel 3555 (delete $self->{timer})->cancel
3035 if $self->{timer}; 3556 if $self->{timer};
3036 3557
3037 $self->SUPER::destroy; 3558 $self->SUPER::destroy;
3038} 3559}
3039 3560
3040############################################################################# 3561#############################################################################
3041 3562
3042package CFClient::UI::Buttonbar; 3563package CFPlus::UI::Buttonbar;
3043 3564
3044our @ISA = CFClient::UI::HBox::; 3565our @ISA = CFPlus::UI::HBox::;
3045 3566
3046# TODO: should actualyl wrap buttons and other goodies. 3567# TODO: should actually wrap buttons and other goodies.
3047 3568
3048############################################################################# 3569#############################################################################
3049 3570
3050package CFClient::UI::Menu; 3571package CFPlus::UI::Menu;
3051 3572
3052our @ISA = CFClient::UI::FancyFrame::; 3573our @ISA = CFPlus::UI::Toplevel::;
3053 3574
3054use CFClient::OpenGL; 3575use CFPlus::OpenGL;
3055 3576
3056sub new { 3577sub new {
3057 my $class = shift; 3578 my $class = shift;
3058 3579
3059 my $self = $class->SUPER::new ( 3580 my $self = $class->SUPER::new (
3060 items => [], 3581 items => [],
3061 z => 100, 3582 z => 100,
3062 @_, 3583 @_,
3063 ); 3584 );
3064 3585
3065 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3586 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3066 3587
3067 for my $item (@{ $self->{items} }) { 3588 for my $item (@{ $self->{items} }) {
3068 my ($widget, $cb, $tooltip) = @$item; 3589 my ($widget, $cb, $tooltip) = @$item;
3069 3590
3070 # handle various types of items, only text for now 3591 # handle various types of items, only text for now
3071 if (!ref $widget) { 3592 if (!ref $widget) {
3593 if ($widget =~ /\t/) {
3594 my ($left, $right) = split /\t/, $widget, 2;
3595
3072 $widget = new CFClient::UI::Label 3596 $widget = new CFPlus::UI::HBox
3073 can_hover => 1, 3597 can_hover => 1,
3074 can_events => 1, 3598 can_events => 1,
3599 tooltip => $tooltip,
3600 children => [
3601 (new CFPlus::UI::Label markup => $left, expand => 1),
3602 (new CFPlus::UI::Label markup => $right, align => +1),
3603 ],
3604 ;
3605
3606 } else {
3607 $widget = new CFPlus::UI::Label
3608 can_hover => 1,
3609 can_events => 1,
3075 markup => $widget, 3610 markup => $widget,
3076 tooltip => $tooltip 3611 tooltip => $tooltip;
3612 }
3077 } 3613 }
3078 3614
3079 $self->{item}{$widget} = $item; 3615 $self->{item}{$widget} = $item;
3080 3616
3081 $self->{vbox}->add ($widget); 3617 $self->{vbox}->add ($widget);
… …
3124 1 3660 1
3125} 3661}
3126 3662
3127############################################################################# 3663#############################################################################
3128 3664
3129package CFClient::UI::Multiplexer; 3665package CFPlus::UI::Multiplexer;
3130 3666
3131our @ISA = CFClient::UI::Container::; 3667our @ISA = CFPlus::UI::Container::;
3132 3668
3133sub new { 3669sub new {
3134 my $class = shift; 3670 my $class = shift;
3135 3671
3136 my $self = $class->SUPER::new ( 3672 my $self = $class->SUPER::new (
… …
3150 3686
3151 $self->{current} = $self->{children}[0] 3687 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} }; 3688 if @{ $self->{children} };
3153} 3689}
3154 3690
3691sub get_current_page {
3692 my ($self) = @_;
3693
3694 $self->{current}
3695}
3696
3155sub set_current_page { 3697sub set_current_page {
3156 my ($self, $page_or_widget) = @_; 3698 my ($self, $page_or_widget) = @_;
3157 3699
3158 my $widget = ref $page_or_widget 3700 my $widget = ref $page_or_widget
3159 ? $page_or_widget 3701 ? $page_or_widget
… …
3191 $self->{current}->draw; 3733 $self->{current}->draw;
3192} 3734}
3193 3735
3194############################################################################# 3736#############################################################################
3195 3737
3196package CFClient::UI::Notebook; 3738package CFPlus::UI::Notebook;
3197 3739
3198our @ISA = CFClient::UI::VBox::; 3740our @ISA = CFPlus::UI::VBox::;
3199 3741
3200sub new { 3742sub new {
3201 my $class = shift; 3743 my $class = shift;
3202 3744
3203 my $self = $class->SUPER::new ( 3745 my $self = $class->SUPER::new (
3204 buttonbar => (new CFClient::UI::Buttonbar), 3746 buttonbar => (new CFPlus::UI::Buttonbar),
3205 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3747 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3206 # filter => # will be put between multiplexer and $self 3748 # filter => # will be put between multiplexer and $self
3207 @_, 3749 @_,
3208 ); 3750 );
3209 3751
3210 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3752 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3211 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3753 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3212 3754
3755 {
3756 Scalar::Util::weaken (my $wself = $self);
3757
3758 $self->{multiplexer}->connect (c_add => sub {
3759 my ($mplex, $widgets) = @_;
3760
3761 for my $child (@$widgets) {
3762 Scalar::Util::weaken $child;
3763 $child->{c_tab_} ||= do {
3764 my $tab =
3765 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3766 ? $child->{c_tab}
3767 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3768
3769 $tab->connect (activate => sub {
3770 $wself->set_current_page ($child);
3771 });
3772
3773 $tab
3774 };
3775
3776 $self->{buttonbar}->add ($child->{c_tab_});
3777 }
3778 });
3779
3780 $self->{multiplexer}->connect (c_remove => sub {
3781 my ($mplex, $widgets) = @_;
3782
3783 for my $child (@$widgets) {
3784 $wself->{buttonbar}->remove ($child->{c_tab_});
3785 }
3786 });
3787 }
3788
3213 $self 3789 $self
3214} 3790}
3215 3791
3216sub add { 3792sub add {
3793 my ($self, @widgets) = @_;
3794
3795 $self->{multiplexer}->add (@widgets)
3796}
3797
3798sub remove {
3799 my ($self, @widgets) = @_;
3800
3801 $self->{multiplexer}->remove (@widgets)
3802}
3803
3804sub add_tab {
3217 my ($self, $title, $widget, $tooltip) = @_; 3805 my ($self, $title, $widget, $tooltip) = @_;
3218 3806
3219 Scalar::Util::weaken $self; 3807 $title = [$title, $tooltip] unless ref $title;
3808 $widget->{c_tab} = $title;
3220 3809
3221 $self->{buttonbar}->add (new CFClient::UI::Button
3222 markup => $title,
3223 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) },
3225 );
3226
3227 $self->{multiplexer}->add ($widget); 3810 $self->add ($widget);
3811}
3812
3813sub get_current_page {
3814 my ($self) = @_;
3815
3816 $self->{multiplexer}->get_current_page
3228} 3817}
3229 3818
3230sub set_current_page { 3819sub set_current_page {
3231 my ($self, $page) = @_; 3820 my ($self, $page) = @_;
3232 3821
… …
3234 $self->emit (page_changed => $self->{multiplexer}{current}); 3823 $self->emit (page_changed => $self->{multiplexer}{current});
3235} 3824}
3236 3825
3237############################################################################# 3826#############################################################################
3238 3827
3239package CFClient::UI::Combobox; 3828package CFPlus::UI::Selector;
3240 3829
3241use utf8; 3830use utf8;
3242 3831
3243our @ISA = CFClient::UI::Button::; 3832our @ISA = CFPlus::UI::Button::;
3244 3833
3245sub new { 3834sub new {
3246 my $class = shift; 3835 my $class = shift;
3247 3836
3248 my $self = $class->SUPER::new ( 3837 my $self = $class->SUPER::new (
… …
3265 my ($value, $title, $tooltip) = @$_; 3854 my ($value, $title, $tooltip) = @$_;
3266 3855
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3856 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 } 3857 }
3269 3858
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3859 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271} 3860}
3272 3861
3273sub _set_value { 3862sub _set_value {
3274 my ($self, $value) = @_; 3863 my ($self, $value) = @_;
3275 3864
… …
3290 $self->emit (changed => $value); 3879 $self->emit (changed => $value);
3291} 3880}
3292 3881
3293############################################################################# 3882#############################################################################
3294 3883
3295package CFClient::UI::Statusbox; 3884package CFPlus::UI::Statusbox;
3296 3885
3297our @ISA = CFClient::UI::VBox::; 3886our @ISA = CFPlus::UI::VBox::;
3298 3887
3299sub new { 3888sub new {
3300 my $class = shift; 3889 my $class = shift;
3301 3890
3302 my $self = $class->SUPER::new ( 3891 my $self = $class->SUPER::new (
3303 fontsize => 0.8, 3892 fontsize => 0.8,
3304 @_, 3893 @_,
3305 ); 3894 );
3306 3895
3307 Scalar::Util::weaken (my $this = $self); 3896 CFPlus::weaken (my $this = $self);
3308 3897
3309 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3898 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3310 3899
3311 $self 3900 $self
3312} 3901}
… …
3314sub reorder { 3903sub reorder {
3315 my ($self) = @_; 3904 my ($self) = @_;
3316 my $NOW = Time::HiRes::time; 3905 my $NOW = Time::HiRes::time;
3317 3906
3318 # freeze display when hovering over any label 3907 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner} 3908 return if $CFPlus::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3909 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} }; 3910 values %{ $self->{item} };
3322 3911
3323 while (my ($k, $v) = each %{ $self->{item} }) { 3912 while (my ($k, $v) = each %{ $self->{item} }) {
3324 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3913 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3325 } 3914 }
… …
3346 for ($short) { 3935 for ($short) {
3347 s/^\s+//; 3936 s/^\s+//;
3348 s/\s+/ /g; 3937 s/\s+/ /g;
3349 } 3938 }
3350 3939
3351 new CFClient::UI::Label 3940 new CFPlus::UI::Label
3352 markup => $short, 3941 markup => $short,
3353 tooltip => $item->{tooltip}, 3942 tooltip => $item->{tooltip},
3354 tooltip_font => $::FONT_PROP, 3943 tooltip_font => $::FONT_PROP,
3355 tooltip_width => 0.67, 3944 tooltip_width => 0.67,
3356 fontsize => $item->{fontsize} || $self->{fontsize}, 3945 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3410 count => 1, 3999 count => 1,
3411 %arg, 4000 %arg,
3412 }; 4001 };
3413 } 4002 }
3414 4003
4004 $ROOT->on_refresh (reorder => sub {
3415 $self->reorder; 4005 $self->reorder;
4006 });
3416} 4007}
3417 4008
3418sub reconfigure { 4009sub reconfigure {
3419 my ($self) = @_; 4010 my ($self) = @_;
3420 4011
… …
3433 $self->SUPER::destroy; 4024 $self->SUPER::destroy;
3434} 4025}
3435 4026
3436############################################################################# 4027#############################################################################
3437 4028
3438package CFClient::UI::Inventory;
3439
3440our @ISA = CFClient::UI::ScrolledWindow::;
3441
3442sub new {
3443 my $class = shift;
3444
3445 my $self = $class->SUPER::new (
3446 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3447 @_,
3448 );
3449
3450 $self
3451}
3452
3453sub set_items {
3454 my ($self, $items) = @_;
3455
3456 $self->{child}->clear;
3457 return unless $items;
3458
3459 my @items = sort {
3460 ($a->{type} <=> $b->{type})
3461 or ($a->{name} cmp $b->{name})
3462 } @$items;
3463
3464 $self->{real_items} = \@items;
3465
3466 my $row = 0;
3467 for my $item (@items) {
3468 CFClient::Item::update_widgets $item;
3469
3470 $self->{child}->add (0, $row, $item->{face_widget});
3471 $self->{child}->add (1, $row, $item->{desc_widget});
3472 $self->{child}->add (2, $row, $item->{weight_widget});
3473
3474 $row++;
3475 }
3476}
3477
3478#############################################################################
3479
3480package CFClient::UI::SpellList;
3481
3482our @ISA = CFClient::UI::Table::;
3483
3484sub new {
3485 my $class = shift;
3486
3487 my $self = $class->SUPER::new (
3488 binding => [],
3489 commands => [],
3490 @_,
3491 )
3492}
3493
3494my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3495
3496my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3497 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3498my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3500my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3501 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3502my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3504my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3506
3507sub rebuild_spell_list {
3508 my ($self) = @_;
3509
3510 $CFClient::UI::ROOT->on_refresh ($self => sub {
3511 $self->clear;
3512
3513 return unless $::CONN;
3514
3515 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3517 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3518 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3519 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3520
3521 my $row = 0;
3522
3523 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524 my $spell = $self->{spell}{$_};
3525
3526 $row++;
3527
3528 my $spell_cb = sub {
3529 my ($widget, $ev) = @_;
3530
3531 if ($ev->{button} == 1) {
3532 $::CONN->user_send ("cast $spell->{name}");
3533 } elsif ($ev->{button} == 2) {
3534 $::CONN->user_send ("invoke $spell->{name}");
3535 } elsif ($ev->{button} == 3) {
3536 (new CFClient::UI::Menu
3537 items => [
3538 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540 ],
3541 )->popup ($ev);
3542 } else {
3543 return 0;
3544 }
3545
3546 1
3547 };
3548
3549 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550
3551 #TODO: add path info to tooltip
3552 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3553
3554 $self->add (0, $row, new CFClient::UI::Face
3555 face => $spell->{face},
3556 can_hover => 1,
3557 can_events => 1,
3558 tooltip => $tooltip,
3559 on_button_down => $spell_cb,
3560 );
3561
3562 $self->add (1, $row, new CFClient::UI::Label
3563 expand => 1,
3564 text => $spell->{name},
3565 can_hover => 1,
3566 can_events => 1,
3567 tooltip => $tooltip,
3568 on_button_down => $spell_cb,
3569 );
3570
3571 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3572 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3573 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3574 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3575 }
3576 });
3577}
3578
3579sub add_spell {
3580 my ($self, $spell) = @_;
3581
3582 $self->{spell}->{$spell->{name}} = $spell;
3583 $self->rebuild_spell_list;
3584}
3585
3586sub remove_spell {
3587 my ($self, $spell) = @_;
3588
3589 delete $self->{spell}->{$spell->{name}};
3590 $self->rebuild_spell_list;
3591}
3592
3593sub clear_spells {
3594 my ($self) = @_;
3595
3596 $self->{spell} = {};
3597 $self->rebuild_spell_list;
3598}
3599
3600#############################################################################
3601
3602package CFClient::UI::Root; 4029package CFPlus::UI::Root;
3603 4030
3604our @ISA = CFClient::UI::Container::; 4031our @ISA = CFPlus::UI::Container::;
3605 4032
3606use List::Util qw(min max); 4033use List::Util qw(min max);
3607 4034
3608use CFClient::OpenGL; 4035use CFPlus::OpenGL;
3609 4036
3610sub new { 4037sub new {
3611 my $class = shift; 4038 my $class = shift;
3612 4039
3613 my $self = $class->SUPER::new ( 4040 my $self = $class->SUPER::new (
3614 visible => 1, 4041 visible => 1,
3615 @_, 4042 @_,
3616 ); 4043 );
3617 4044
3618 Scalar::Util::weaken ($self->{root} = $self); 4045 CFPlus::weaken ($self->{root} = $self);
3619 4046
3620 $self 4047 $self
3621} 4048}
3622 4049
3623sub size_request { 4050sub size_request {
… …
3718 while ($self->{refresh_hook}) { 4145 while ($self->{refresh_hook}) {
3719 $_->() 4146 $_->()
3720 for values %{delete $self->{refresh_hook}}; 4147 for values %{delete $self->{refresh_hook}};
3721 } 4148 }
3722 4149
3723 if ($self->{realloc}) { 4150 while ($self->{realloc}) {
3724 my %queue; 4151 my %queue;
3725 my @queue; 4152 my @queue;
3726 my $widget; 4153 my $widget;
3727 4154
3728 outer: 4155 outer:
… …
3775 } 4202 }
3776 } 4203 }
3777 4204
3778 delete $self->{realloc}{$widget+0}; 4205 delete $self->{realloc}{$widget+0};
3779 } 4206 }
3780 }
3781 4207
3782 while (my $size_alloc = delete $self->{size_alloc}) { 4208 while (my $size_alloc = delete $self->{size_alloc}) {
3783 my @queue = sort { $b->{visible} <=> $a->{visible} } 4209 my @queue = sort { $a->{visible} <=> $b->{visible} }
3784 values %$size_alloc; 4210 values %$size_alloc;
3785 4211
3786 while () { 4212 while () {
3787 my $widget = pop @queue || last; 4213 my $widget = pop @queue || last;
3788 4214
3789 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4215 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3790 4216
3791 $w = 0 if $w < 0; 4217 $w = max $widget->{min_w}, $w;
3792 $h = 0 if $h < 0; 4218 $h = max $widget->{min_h}, $h;
3793 4219
4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4222
4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4225
3794 $w = int $w + 0.5; 4226 $w = int $w + 0.5;
3795 $h = int $h + 0.5; 4227 $h = int $h + 0.5;
3796 4228
3797 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4229 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3798 $widget->{old_w} = $widget->{w}; 4230 $widget->{old_w} = $widget->{w};
3799 $widget->{old_h} = $widget->{h}; 4231 $widget->{old_h} = $widget->{h};
3800 4232
3801 $widget->{w} = $w; 4233 $widget->{w} = $w;
3802 $widget->{h} = $h; 4234 $widget->{h} = $h;
3803 4235
3804 $widget->emit (size_allocate => $w, $h); 4236 $widget->emit (size_allocate => $w, $h);
4237 }
3805 } 4238 }
3806 } 4239 }
3807 } 4240 }
3808 4241
3809 while ($self->{post_alloc_hook}) { 4242 while ($self->{post_alloc_hook}) {
3810 $_->() 4243 $_->()
3811 for values %{delete $self->{post_alloc_hook}}; 4244 for values %{delete $self->{post_alloc_hook}};
3812 } 4245 }
3813
3814 4246
3815 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4247 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3816 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4248 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3817 glClear GL_COLOR_BUFFER_BIT; 4249 glClear GL_COLOR_BUFFER_BIT;
3818 4250
… …
3821 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4253 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3822 glMatrixMode GL_MODELVIEW; 4254 glMatrixMode GL_MODELVIEW;
3823 glLoadIdentity; 4255 glLoadIdentity;
3824 4256
3825 { 4257 {
3826 package CFClient::UI::Base; 4258 package CFPlus::UI::Base;
3827 4259
3828 ($draw_x, $draw_y, $draw_w, $draw_h) = 4260 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3829 (0, 0, $self->{w}, $self->{h}); 4261 (0, 0, $self->{w}, $self->{h});
3830 }
3831 4262
3832 $self->_draw; 4263 $self->_draw;
4264 }
3833} 4265}
3834 4266
3835############################################################################# 4267#############################################################################
3836 4268
3837package CFClient::UI; 4269package CFPlus::UI;
3838 4270
3839$ROOT = new CFClient::UI::Root; 4271$ROOT = new CFPlus::UI::Root;
3840$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4272$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3841 4273
38421 42741
3843 4275

Diff Legend

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