ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.397 by root, Sat Jul 21 14:01:35 2007 UTC

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

Diff Legend

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