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.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

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

Diff Legend

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