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

Diff Legend

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