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

Diff Legend

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