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.394 by root, Sat Jul 21 13:54:03 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98 120
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
101} 129}
102 130
103sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
104 my ($ev) = @_; 132 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 133
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 135
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 137
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
112 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 140
114 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 143 $grab->update if $grab;
117 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
118 145
146 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 147 $TOOLTIP_WATCHER->cb->();
120 } 148 }
121} 149}
122 150
123sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
124 my ($ev) = @_; 152 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
126 154
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 156
129 if ($widget != $HOVER) { 157 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 158
132 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 160 if $HOVER;
140} 161}
141 162
142# convert position array to integers 163# convert position array to integers
143sub harmonize { 164sub harmonize {
… …
193 reconfigure_widgets; 214 reconfigure_widgets;
194} 215}
195 216
196############################################################################# 217#############################################################################
197 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
198package CFClient::UI::Base; 227package CFPlus::UI::Base;
199 228
200use strict; 229use strict;
201 230
202use CFClient::OpenGL; 231use CFPlus::OpenGL;
203 232
204sub new { 233sub new {
205 my $class = shift; 234 my $class = shift;
206 235
207 my $self = bless { 236 my $self = bless {
… …
212 h => undef, 241 h => undef,
213 can_events => 1, 242 can_events => 1,
214 @_ 243 @_
215 }, $class; 244 }, $class;
216 245
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 247
219 for (keys %$self) { 248 for (keys %$self) {
220 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
222 } 251 }
223 } 252 }
224 253
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 259
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 262
234 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
239 268
240sub destroy { 269sub destroy {
241 my ($self) = @_; 270 my ($self) = @_;
242 271
243 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
244 %$self = (); 274 %$self = ();
245} 275}
246 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
247sub show { 281sub show {
248 my ($self) = @_; 282 my ($self) = @_;
249 283
250 return if $self->{parent}; 284 return if $self->{parent};
251 285
252 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
253} 287}
254 288
255sub set_visible { 289sub set_visible {
256 my ($self) = @_; 290 my ($self) = @_;
257 291
… …
278 delete $self->{root}; 312 delete $self->{root};
279 313
280 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
282 316
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
285 319
286 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
… …
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
335sub size_request { 369sub size_request {
336 require Carp; 370 require Carp;
337 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
338} 372}
339 373
374sub baseline_shift {
375 0
376}
377
340sub configure { 378sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
342 380
343 if ($self->{aspect}) { 381 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
345 383
346 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 386
349 # use alignment to adjust x, y 387 # use alignment to adjust x, y
350 388
351 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
393 431
394 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
395 433
396 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
397 435
398 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
400 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
401 } 439 }
402} 440}
403 441
404# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
405sub coord2local { 443sub coord2local {
406 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
407 445
446 Carp::confess unless $self->{parent};#d#
447
408 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409} 449}
410 450
411# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
412sub coord2global { 452sub coord2global {
413 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
414 454
455 Carp::confess unless $self->{parent};#d#
456
415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416} 458}
417 459
418sub invoke_focus_in { 460sub invoke_focus_in {
419 my ($self) = @_; 461 my ($self) = @_;
420 462
421 return if $FOCUS == $self; 463 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
423 465
424 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
425 467
426 $focus->update if $focus; 468 $self->update;
427 $FOCUS->update;
428 469
429 0 470 0
430} 471}
431 472
432sub invoke_focus_out { 473sub invoke_focus_out {
433 my ($self) = @_; 474 my ($self) = @_;
434 475
435 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
436 477
437 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
438 479
439 $focus->update if $focus; #? 480 $self->update;
440 481
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 483 unless $FOCUS;
443 484
444 0 485 0
445} 486}
446 487
447sub grab_focus { 488sub grab_focus {
448 my ($self) = @_; 489 my ($self) = @_;
449 490
491 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 492 $self->emit ("focus_in");
451} 493}
452 494
453sub invoke_mouse_motion { 1 } 495sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 496sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 497sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
457 500
458sub invoke_button_down { 501sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
460 503
461 $self->grab_focus; 504 $self->grab_focus;
462 505
463 1 506 0
464} 507}
465 508
466sub connect { 509sub connect {
467 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
468 511
469 push @{ $self->{signal_cb}{$signal} }, $cb; 512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
470} 518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
471 532
472sub emit { 533sub emit {
473 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
474 535
475 #d##TODO# stop propagating at first true, do not use sum 536 # I do not really like this solution, but I do not like duplication
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
479} 554}
480 555
481sub find_widget { 556#sub find_widget {
482 my ($self, $x, $y) = @_; 557# in .xs
483
484 return () unless $self->{can_events};
485
486 return $self
487 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
488 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
489
490 ()
491}
492 558
493sub set_parent { 559sub set_parent {
494 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
495 561
496 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
497 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
498} 564}
499 565
500sub realloc { 566sub realloc {
501 my ($self) = @_; 567 my ($self) = @_;
… …
535 return unless $self->{h} && $self->{w}; 601 return unless $self->{h} && $self->{w};
536 602
537 # update screen rectangle 603 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 604 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 605 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 606
543 # skip widgets that are entirely outside the drawing area 607 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 610
… …
569 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
570 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
571 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
572 glEnd; 636 glEnd;
573 glPopMatrix; 637 glPopMatrix;
574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
575 } 639 }
576 640
577 $self->_draw; 641 $self->_draw;
578 glPopMatrix; 642 glPopMatrix;
579} 643}
… …
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}
1106
1107#TODO# update range on size_allocate depending on child?
988 1108
989sub add { 1109sub add {
990 my ($self, $widget) = @_; 1110 my ($self, $widget) = @_;
991 1111
992 $self->{vp}->add ($self->{child} = $widget); 1112 $self->{vp}->add ($self->{child} = $widget);
993} 1113}
994 1114
1115sub update_slider {
1116 my ($self) = @_;
1117
1118 my $child = ($self->{vp} or return)->child;
1119
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122
1123 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{hslider})
1127 : $self->SUPER::remove ($self->{hslider});
1128 }
1129
1130 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1131 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1132
1133 my $visible = $h1 > $h2;
1134 if ($visible != $self->{vslider_visible}) {
1135 $self->{vslider_visible} = $visible;
1136 $visible ? $self->SUPER::add ($self->{vslider})
1137 : $self->SUPER::remove ($self->{vslider});
1138 }
1139}
1140
995sub update { 1141sub update {
996 my ($self) = @_; 1142 my ($self) = @_;
997 1143
1144 $self->update_slider;
998 $self->SUPER::update; 1145 $self->SUPER::update;
1146}
999 1147
1000 # todo: overwrite size_allocate of child 1148sub invoke_mouse_wheel {
1001 my $child = $self->{vp}->child; 1149 my ($self, $ev) = @_;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1150
1151 $self->{vslider}->emit (mouse_wheel => $ev)
1152 if $ev->{dy};
1153
1154 $self->{hslider}->emit (mouse_wheel => $ev)
1155 if $ev->{dx};
1156
1157 1
1158}
1159
1160sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_;
1162
1163 if ($ev->{button} == 2) {
1164 $self->grab_focus;
1165
1166 my $ox = $self->{vp}{view_x} + $ev->{x};
1167 my $oy = $self->{vp}{view_y} + $ev->{y};
1168
1169 $self->{motion} = sub {
1170 my ($ev, $x, $y) = @_;
1171
1172 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1173 $self->update;
1174 };
1175
1176 return 1;
1177 }
1178
1179 0
1180}
1181
1182sub invoke_button_up {
1183 my ($self, $ev, $x, $y) = @_;
1184
1185 if (delete $self->{motion}) {
1186 return 1;
1187 }
1188
1189 0
1190}
1191
1192sub invoke_mouse_motion {
1193 my ($self, $ev, $x, $y) = @_;
1194
1195 if ($self->{motion}) {
1196 $self->{motion}->($ev, $x, $y);
1197 return 1;
1198 }
1199
1200 0
1003} 1201}
1004 1202
1005sub invoke_size_allocate { 1203sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1204 my ($self, $w, $h) = @_;
1007 1205
1008 my $child = $self->{vp}->child; 1206 $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) 1207 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1208}
1013 1209
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016
1017############################################################################# 1210#############################################################################
1018 1211
1019package CFClient::UI::Frame; 1212package CFPlus::UI::Frame;
1020 1213
1021our @ISA = CFClient::UI::Bin::; 1214our @ISA = CFPlus::UI::Bin::;
1022 1215
1023use CFClient::OpenGL; 1216use CFPlus::OpenGL;
1024 1217
1025sub new { 1218sub new {
1026 my $class = shift; 1219 my $class = shift;
1027 1220
1028 $class->SUPER::new ( 1221 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1247 $self->SUPER::_draw;
1055} 1248}
1056 1249
1057############################################################################# 1250#############################################################################
1058 1251
1059package CFClient::UI::FancyFrame; 1252package CFPlus::UI::FancyFrame;
1060 1253
1061our @ISA = CFClient::UI::Bin::; 1254our @ISA = CFPlus::UI::Bin::;
1062 1255
1063use CFClient::OpenGL; 1256use CFPlus::OpenGL;
1257
1258sub new {
1259 my ($class, %arg) = @_;
1260
1261 if ((exists $arg{label}) && !ref $arg{label}) {
1262 $arg{label} = new CFPlus::UI::Label
1263 align => 1,
1264 valign => 0,
1265 text => $arg{label},
1266 fontsize => ($arg{border} || 0.8) * 0.75;
1267 }
1268
1269 my $self = $class->SUPER::new (
1270 # label => "",
1271 fg => [0.6, 0.3, 0.1],
1272 border => 0.8,
1273 style => 'single',
1274 %arg,
1275 );
1276
1277 $self
1278}
1279
1280sub add {
1281 my ($self, @widgets) = @_;
1282
1283 $self->SUPER::add (@widgets);
1284 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1285}
1286
1287sub border {
1288 int $_[0]{border} * $::FONTSIZE
1289}
1290
1291sub size_request {
1292 my ($self) = @_;
1293
1294 ($self->{label_w}, undef) = $self->{label}->size_request
1295 if $self->{label};
1296
1297 my ($w, $h) = $self->SUPER::size_request;
1298
1299 (
1300 $w + $self->border * 2,
1301 $h + $self->border * 2,
1302 )
1303}
1304
1305sub invoke_size_allocate {
1306 my ($self, $w, $h) = @_;
1307
1308 my $border = $self->border;
1309
1310 $w -= List::Util::max 0, $border * 2;
1311 $h -= List::Util::max 0, $border * 2;
1312
1313 if (my $label = $self->{label}) {
1314 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1315 $label->{h} = List::Util::min $h, $border;
1316 $label->invoke_size_allocate ($label->{w}, $label->{h});
1317 }
1318
1319 $self->child->configure ($border, $border, $w, $h);
1320
1321 1
1322}
1323
1324sub _draw {
1325 my ($self) = @_;
1326
1327 my $child = $self->{children}[0];
1328
1329 my $border = $self->border;
1330 my ($w, $h) = ($self->{w}, $self->{h});
1331
1332 $child->draw;
1333
1334 glColor @{$self->{fg}};
1335 glBegin GL_LINE_STRIP;
1336 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1337 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1338 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1339 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1340 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1341 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1342 glEnd;
1343
1344 if ($self->{label}) {
1345 glTranslate $border * 2, 0;
1346 $self->{label}->_draw;
1347 }
1348}
1349
1350#############################################################################
1351
1352package CFPlus::UI::Toplevel;
1353
1354our @ISA = CFPlus::UI::Bin::;
1355
1356use CFPlus::OpenGL;
1064 1357
1065my $bg = 1358my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1359 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1; 1360 mipmap => 1, wrap => 1;
1068 1361
1069my @border = 1362my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1363 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); 1364 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1365
1366my @icon =
1367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1368 qw(x1_move.png x1_resize.png);
1072 1369
1073sub new { 1370sub new {
1074 my ($class, %arg) = @_; 1371 my ($class, %arg) = @_;
1075 1372
1076 my $self = $class->SUPER::new ( 1373 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1374 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1375 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1376 border => 0.6,
1080 can_events => 1, 1377 can_events => 1,
1081 min_w => 16, 1378 min_w => 64,
1082 min_h => 16, 1379 min_h => 32,
1083 %arg, 1380 %arg,
1084 ); 1381 );
1085 1382
1086 $self->{title_widget} = new CFClient::UI::Label 1383 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 1384 align => 0,
1088 valign => 1, 1385 valign => 1,
1089 text => $self->{title}, 1386 text => $self->{title},
1090 fontsize => $self->{border}, 1387 fontsize => $self->{border},
1091 if exists $self->{title}; 1388 if exists $self->{title};
1092 1389
1093 if ($self->{has_close_button}) { 1390 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1391 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1392 new CFPlus::UI::ImageButton
1096 path => 'x1_close.png', 1393 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1394 on_activate => sub { $self->emit ("delete") };
1098 1395
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1396 $self->CFPlus::UI::Container::add ($self->{close_button});
1100 } 1397 }
1101 1398
1102 $self 1399 $self
1103} 1400}
1104 1401
1105sub add { 1402sub add {
1106 my ($self, @widgets) = @_; 1403 my ($self, @widgets) = @_;
1107 1404
1108 $self->SUPER::add (@widgets); 1405 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1406 $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}; 1407 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111} 1408}
1112 1409
1113sub border { 1410sub border {
1114 int $_[0]{border} * $::FONTSIZE 1411 int $_[0]{border} * $::FONTSIZE
1115} 1412}
… …
1148 $self->child->configure ($border, $border, $w, $h); 1445 $self->child->configure ($border, $border, $w, $h);
1149 1446
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1447 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1448 if $self->{close_button};
1152 1449
1450 1
1451}
1452
1453sub invoke_delete {
1454 my ($self) = @_;
1455
1456 $self->hide;
1457
1153 1 1458 1
1154} 1459}
1155 1460
1156sub invoke_button_down { 1461sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1462 my ($self, $ev, $x, $y) = @_;
… …
1215 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1520 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216 1521
1217 ! ! $self->{motion} 1522 ! ! $self->{motion}
1218} 1523}
1219 1524
1525sub invoke_visibility_change {
1526 my ($self, $visible) = @_;
1527
1528 delete $self->{motion} unless $visible;
1529
1530 0
1531}
1532
1220sub _draw { 1533sub _draw {
1221 my ($self) = @_; 1534 my ($self) = @_;
1222 1535
1223 my $child = $self->{children}[0]; 1536 my $child = $self->{children}[0];
1224 1537
… …
1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1542 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1230 1543
1231 my $border = $self->border; 1544 my $border = $self->border;
1232 1545
1233 glColor @{ $self->{border_bg} }; 1546 glColor @{ $self->{border_bg} };
1234 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1547 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1235 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1548 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1236 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1549 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1237 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1550 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1551
1552 # move
1553 my $w2 = ($w - $border) * .5;
1554 my $h2 = ($h - $border) * .5;
1555 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1557 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1558
1559 # resize
1560 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1561 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1562 unless $self->{has_close_button};
1563 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1564 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1238 1565
1239 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1566 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1240 glColor @{ $self->{bg} }; 1567 glColor @{ $self->{bg} };
1241 1568
1242 # TODO: repeat texture not scale 1569 # TODO: repeat texture not scale
… …
1261 if $self->{close_button}; 1588 if $self->{close_button};
1262} 1589}
1263 1590
1264############################################################################# 1591#############################################################################
1265 1592
1266package CFClient::UI::Table; 1593package CFPlus::UI::Table;
1267 1594
1268our @ISA = CFClient::UI::Base::; 1595our @ISA = CFPlus::UI::Container::;
1269 1596
1270use List::Util qw(max sum); 1597use List::Util qw(max sum);
1271 1598
1272use CFClient::OpenGL; 1599use CFPlus::OpenGL;
1273 1600
1274sub new { 1601sub new {
1275 my $class = shift; 1602 my $class = shift;
1276 1603
1277 $class->SUPER::new ( 1604 $class->SUPER::new (
1278 col_expand => [], 1605 col_expand => [],
1606 row_expand => [],
1279 @_, 1607 @_,
1280 ) 1608 )
1281} 1609}
1282 1610
1283sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285}
1286
1287sub add { 1611sub add {
1288 my ($self, $x, $y, $child) = @_; 1612 my ($self, @widgets) = @_;
1289 1613
1290 $child->set_parent ($self); 1614 for my $child (@widgets) {
1291 $self->{children}[$y][$x] = $child; 1615 $child->{rowspan} ||= 1;
1616 $child->{colspan} ||= 1;
1617 }
1292 1618
1293 $self->realloc; 1619 $self->SUPER::add (@widgets);
1294} 1620}
1295 1621
1296sub remove { 1622sub add_at {
1623 my $self = shift;
1624
1625 my @widgets;
1626
1627 while (@_) {
1628 my ($col, $row, $child) = splice @_, 0, 3, ();
1629
1630 $child->{row} = $row;
1631 $child->{col} = $col;
1632
1633 push @widgets, $child;
1634 }
1635
1636 $self->add (@widgets);
1637}
1638
1639sub get_wh {
1297 my ($self, $child) = @_; 1640 my ($self) = @_;
1298 1641
1299 # TODO: not yet implemented 1642 my (@w, @h);
1300}
1301
1302# TODO: move to container class maybe? send children a signal on removal?
1303sub clear {
1304 my ($self) = @_;
1305 1643
1306 my @children = $self->children; 1644 my @children = $self->children;
1307 delete $self->{children}; 1645
1646 # first pass, columns
1647 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1648 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1649
1650 my $sw = sum @w[$c .. $c + $cs - 1];
1651
1652 if ($w > $sw) {
1653 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1654 }
1308 1655 }
1309 for (@children) {
1310 delete $_->{parent};
1311 $_->hide;
1312 }
1313 1656
1314 $self->realloc; 1657 # second pass, rows
1315} 1658 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)}; 1659 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1330 1660
1331 $w[$x] = max $w[$x], $w; 1661 my $sh = sum @h[$r .. $r + $rs - 1];
1332 $h[$y] = max $h[$y], $h; 1662
1663 if ($h > $sh) {
1664 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1333 } 1665 }
1334 } 1666 }
1335 1667
1336 (\@w, \@h) 1668 (\@w, \@h)
1337} 1669}
… …
1353 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1354 1686
1355 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1356 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1357 1689
1358 # TODO: nicer code && do row_expand 1690 # now linearly scale the rows/columns to the allocated size
1359 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1360 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1361 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1362 1694
1363 # linearly scale sizes
1364 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366 1696
1367 CFClient::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1368 CFClient::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1369 1706
1370 my $y; 1707 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1708 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1371 1709
1372 for my $r (0 .. $#{$self->{children}}) { 1710 for my $widget ($self->children) {
1373 my $row = $self->{children}[$r] 1711 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1374 or next;
1375 1712
1376 my $x = 0; 1713 $widget->configure (
1377 my $row_h = $hs->[$r]; 1714 $x[$c], $y[$r],
1715 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1378 1716 );
1379 for my $c (0 .. $#$row) { 1717 }
1380 my $col_w = $ws->[$c];
1381 1718
1382 if (my $widget = $row->[$c]) { 1719 1
1383 $widget->configure ($x, $y, $col_w, $row_h); 1720}
1384 }
1385 1721
1386 $x += $col_w; 1722#############################################################################
1723
1724package CFPlus::UI::Fixed;
1725
1726use List::Util qw(min max);
1727
1728our @ISA = CFPlus::UI::Container::;
1729
1730sub add {
1731 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1732
1733 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1734 $self->SUPER::add ($child);
1735}
1736
1737sub _scale($$$) {
1738 my ($mode, $val, $max) = @_;
1739
1740 $mode eq "abs" ? $val
1741 : $mode eq "rel" ? $val * $max
1742 : 0
1743}
1744
1745sub size_request {
1746 my ($self) = @_;
1747
1748 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1749
1750 # determine overall size by querying abs widgets
1751 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1753
1754 if ($pos eq "abs") {
1755 $w = _scale $size, $w, $child->{req_w};
1756 $h = _scale $size, $h, $child->{req_h};
1757
1758 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1759 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1387 } 1760 }
1761 }
1388 1762
1389 $y += $row_h; 1763 my $W = $x2 - $x1;
1764 my $H = $y2 - $y1;
1765
1766 # now layout remaining widgets
1767 for my $child ($self->visible_children) {
1768 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1769
1770 if ($pos ne "abs") {
1771 $x = _scale $pos, $x, $W;
1772 $y = _scale $pos, $x, $H;
1773 $w = _scale $size, $w, $child->{req_w};
1774 $h = _scale $size, $h, $child->{req_h};
1775
1776 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1777 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1778 }
1779 }
1780
1781 my $W = $x2 - $x1;
1782 my $H = $y2 - $y1;
1783
1784 ($W, $H)
1785}
1786
1787sub invoke_size_allocate {
1788 my ($self, $W, $H) = @_;
1789
1790 for my $child ($self->visible_children) {
1791 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1792
1793 $x = _scale $pos, $x, $W;
1794 $y = _scale $pos, $x, $H;
1795 $w = _scale $size, $w, $child->{req_w};
1796 $h = _scale $size, $h, $child->{req_h};
1797
1798 $child->configure ($x, $y, $w, $h);
1390 } 1799 }
1391 1800
1392 1 1801 1
1393} 1802}
1394 1803
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############################################################################# 1804#############################################################################
1420 1805
1421package CFClient::UI::Box; 1806package CFPlus::UI::Box;
1422 1807
1423our @ISA = CFClient::UI::Container::; 1808our @ISA = CFPlus::UI::Container::;
1424 1809
1425sub size_request { 1810sub size_request {
1426 my ($self) = @_; 1811 my ($self) = @_;
1427 1812
1428 $self->{vertical} 1813 $self->{vertical}
… …
1461 $req[$_] += $space * $children[$_]{expand} 1846 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#children; 1847 for 0 .. $#children;
1463 } 1848 }
1464 } 1849 }
1465 1850
1466 CFClient::UI::harmonize \@req; 1851 CFPlus::UI::harmonize \@req;
1467 1852
1468 my $pos = 0; 1853 my $pos = 0;
1469 for (0 .. $#children) { 1854 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1855 my $alloc = $req[$_];
1471 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1856 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1476 1 1861 1
1477} 1862}
1478 1863
1479############################################################################# 1864#############################################################################
1480 1865
1481package CFClient::UI::HBox; 1866package CFPlus::UI::HBox;
1482 1867
1483our @ISA = CFClient::UI::Box::; 1868our @ISA = CFPlus::UI::Box::;
1484 1869
1485sub new { 1870sub new {
1486 my $class = shift; 1871 my $class = shift;
1487 1872
1488 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1491 ) 1876 )
1492} 1877}
1493 1878
1494############################################################################# 1879#############################################################################
1495 1880
1496package CFClient::UI::VBox; 1881package CFPlus::UI::VBox;
1497 1882
1498our @ISA = CFClient::UI::Box::; 1883our @ISA = CFPlus::UI::Box::;
1499 1884
1500sub new { 1885sub new {
1501 my $class = shift; 1886 my $class = shift;
1502 1887
1503 $class->SUPER::new ( 1888 $class->SUPER::new (
… …
1506 ) 1891 )
1507} 1892}
1508 1893
1509############################################################################# 1894#############################################################################
1510 1895
1511package CFClient::UI::Label; 1896package CFPlus::UI::Label;
1512 1897
1513our @ISA = CFClient::UI::DrawBG::; 1898our @ISA = CFPlus::UI::DrawBG::;
1514 1899
1515use CFClient::OpenGL; 1900use CFPlus::OpenGL;
1516 1901
1517sub new { 1902sub new {
1518 my ($class, %arg) = @_; 1903 my ($class, %arg) = @_;
1519 1904
1520 my $self = $class->SUPER::new ( 1905 my $self = $class->SUPER::new (
… …
1523 #active_bg => none 1908 #active_bg => none
1524 #font => default_font 1909 #font => default_font
1525 #text => initial text 1910 #text => initial text
1526 #markup => initial narkup 1911 #markup => initial narkup
1527 #max_w => maximum pixel width 1912 #max_w => maximum pixel width
1913 #style => 0, # render flags
1528 ellipsise => 3, # end 1914 ellipsise => 3, # end
1529 layout => (new CFClient::Layout), 1915 layout => (new CFPlus::Layout),
1530 fontsize => 1, 1916 fontsize => 1,
1531 align => -1, 1917 align => -1,
1532 valign => -1, 1918 valign => -1,
1533 padding_x => 2, 1919 padding_x => 2,
1534 padding_y => 2, 1920 padding_y => 2,
1535 can_events => 0, 1921 can_events => 0,
1536 %arg 1922 %arg
1537 ); 1923 );
1538 1924
1539 if (exists $self->{template}) { 1925 if (exists $self->{template}) {
1540 my $layout = new CFClient::Layout; 1926 my $layout = new CFPlus::Layout;
1541 $layout->set_text (delete $self->{template}); 1927 $layout->set_text (delete $self->{template});
1542 $self->{template} = $layout; 1928 $self->{template} = $layout;
1543 } 1929 }
1544 1930
1545 if (exists $self->{markup}) { 1931 if (exists $self->{markup}) {
… …
1549 } 1935 }
1550 1936
1551 $self 1937 $self
1552} 1938}
1553 1939
1554sub escape($) {
1555 local $_ = $_[0];
1556
1557 s/&/&amp;/g;
1558 s/>/&gt;/g;
1559 s/</&lt;/g;
1560
1561 $_
1562}
1563
1564sub update { 1940sub update {
1565 my ($self) = @_; 1941 my ($self) = @_;
1566 1942
1567 delete $self->{texture}; 1943 delete $self->{texture};
1568 $self->SUPER::update; 1944 $self->SUPER::update;
… …
1579 my ($self, $text) = @_; 1955 my ($self, $text) = @_;
1580 1956
1581 return if $self->{text} eq "T$text"; 1957 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1958 $self->{text} = "T$text";
1583 1959
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1960 $self->{layout}->set_text ($text);
1586 1961
1587 delete $self->{size_req}; 1962 delete $self->{size_req};
1588 $self->realloc; 1963 $self->realloc;
1589 $self->update; 1964 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1970 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1971 $self->{text} = "M$markup";
1597 1972
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1973 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1974
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1975 $self->{layout}->set_markup ($markup);
1602 1976
1603 delete $self->{size_req}; 1977 delete $self->{size_req};
1604 $self->realloc; 1978 $self->realloc;
1605 $self->update; 1979 $self->update;
… …
1617 1991
1618 my ($w, $h) = $self->{layout}->size; 1992 my ($w, $h) = $self->{layout}->size;
1619 1993
1620 if (exists $self->{template}) { 1994 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1995 $self->{template}->set_font ($self->{font}) if $self->{font};
1996 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1998
1624 my ($w2, $h2) = $self->{template}->size; 1999 my ($w2, $h2) = $self->{template}->size;
1625 2000
1626 $w = List::Util::max $w, $w2; 2001 $w = List::Util::max $w, $w2;
… …
1631 }; 2006 };
1632 2007
1633 @{ $self->{size_req} } 2008 @{ $self->{size_req} }
1634} 2009}
1635 2010
2011sub baseline_shift {
2012 $_[0]{layout}->descent
2013}
2014
1636sub invoke_size_allocate { 2015sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 2016 my ($self, $w, $h) = @_;
1638 2017
1639 delete $self->{ox}; 2018 delete $self->{ox};
1640 2019
… …
1646 2025
1647sub set_fontsize { 2026sub set_fontsize {
1648 my ($self, $fontsize) = @_; 2027 my ($self, $fontsize) = @_;
1649 2028
1650 $self->{fontsize} = $fontsize; 2029 $self->{fontsize} = $fontsize;
2030 delete $self->{size_req};
1651 delete $self->{texture}; 2031 delete $self->{texture};
1652 2032
1653 $self->realloc; 2033 $self->realloc;
1654} 2034}
1655 2035
1656sub reconfigure { 2036sub reconfigure {
1657 my ($self) = @_; 2037 my ($self) = @_;
1658 2038
1659 delete $self->{size_req}; 2039 delete $self->{size_req};
2040 delete $self->{texture};
1660 2041
1661 $self->SUPER::reconfigure; 2042 $self->SUPER::reconfigure;
1662} 2043}
1663 2044
1664sub _draw { 2045sub _draw {
1665 my ($self) = @_; 2046 my ($self) = @_;
1666 2047
1667 $self->SUPER::_draw; # draw background, if applicable 2048 $self->SUPER::_draw; # draw background, if applicable
1668 2049
1669 my $tex = $self->{texture} ||= do { 2050 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 2051 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2052 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 2053 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2054 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2055 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2056 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 2057
1677 new_from_layout CFClient::Texture $self->{layout} 2058 [$self->{layout}->size]
1678 }; 2059 };
1679 2060
1680 unless (exists $self->{ox}) { 2061 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2062 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2063 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 2064 : ($self->{w} - $size->[0]) * 0.5);
1684 2065
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2066 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2067 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 2068 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 2069 };
1689 2070
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2071 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2072 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 2073
1695 if ($tex->{format} == GL_ALPHA) { 2074 $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} 2075}
1706 2076
1707############################################################################# 2077#############################################################################
1708 2078
1709package CFClient::UI::EntryBase; 2079package CFPlus::UI::EntryBase;
1710 2080
1711our @ISA = CFClient::UI::Label::; 2081our @ISA = CFPlus::UI::Label::;
1712 2082
1713use CFClient::OpenGL; 2083use CFPlus::OpenGL;
1714 2084
1715sub new { 2085sub new {
1716 my $class = shift; 2086 my $class = shift;
1717 2087
1718 $class->SUPER::new ( 2088 $class->SUPER::new (
… …
1722 active_fg => [0, 0, 0], 2092 active_fg => [0, 0, 0],
1723 can_hover => 1, 2093 can_hover => 1,
1724 can_focus => 1, 2094 can_focus => 1,
1725 valign => 0, 2095 valign => 0,
1726 can_events => 1, 2096 can_events => 1,
2097 ellipsise => 0,
1727 #text => ... 2098 #text => ...
1728 #hidden => "*", 2099 #hidden => "*",
1729 @_ 2100 @_
1730 ) 2101 )
1731} 2102}
… …
1776 my $sym = $ev->{sym}; 2147 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 2148 my $uni = $ev->{unicode};
1778 2149
1779 my $text = $self->get_text; 2150 my $text = $self->get_text;
1780 2151
2152 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2153
1781 if ($uni == 8) { 2154 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 2156 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 2157 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 2158 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 2159 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 2160 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2161 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 2162 } elsif ($sym == CFPlus::SDLK_HOME) {
2163 # what a hack
2164 $self->{cursor} =
2165 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2166 ? length $1
2167 : 0;
2168 } elsif ($sym == CFPlus::SDLK_END) {
2169 # uh, again
2170 $self->{cursor} =
2171 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2172 ? $self->{cursor} + length $1
2173 : length $self->{text};
2174 } elsif ($uni == 21) { # ctrl-u
2175 $text = "";
1790 $self->{cursor} = 0; 2176 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 2177 } elsif ($uni == 27) {
1794 $self->emit ('escape'); 2178 $self->emit ('escape');
1795 } elsif ($uni) { 2179 } elsif ($uni == 0x0d) {
2180 substr $text, $self->{cursor}++, 0, "\012";
2181 } elsif ($uni >= 0x20) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 2182 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 2183 } else {
1798 return 0; 2184 return 0;
1799 } 2185 }
1800 2186
1801 $self->_set_text ($text); 2187 $self->_set_text ($text);
1802 2188
1803 $self->realloc; 2189 $self->realloc;
2190 $self->update;
1804 2191
1805 1 2192 1
1806} 2193}
1807 2194
1808sub invoke_focus_in { 2195sub invoke_focus_in {
… …
1820 2207
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2208 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2209
1823 # byte-index to char-index 2210 # byte-index to char-index
1824 my $text = $self->{text}; 2211 my $text = $self->{text};
1825 utf8::encode $text; 2212 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2213 $self->{cursor} = length $text;
1827 2214
1828 $self->_set_text ($self->{text}); 2215 $self->_set_text ($self->{text});
1829 $self->update; 2216 $self->update;
1830 2217
1831 1 2218 1
… …
1870 utf8::encode $text; 2257 utf8::encode $text;
1871 2258
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2259 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873 } 2260 }
1874 2261
1875 glColor @{$self->{fg}};
1876 glBegin GL_LINES; 2262 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2263 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}; 2264 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 2265 glEnd;
1880 } 2266 }
1881} 2267}
1882 2268
2269#############################################################################
2270
1883package CFClient::UI::Entry; 2271package CFPlus::UI::Entry;
1884 2272
1885our @ISA = CFClient::UI::EntryBase::; 2273our @ISA = CFPlus::UI::EntryBase::;
1886 2274
1887use CFClient::OpenGL; 2275use CFPlus::OpenGL;
1888 2276
1889sub invoke_key_down { 2277sub invoke_key_down {
1890 my ($self, $ev) = @_; 2278 my ($self, $ev) = @_;
1891 2279
1892 my $sym = $ev->{sym}; 2280 my $sym = $ev->{sym};
1893 2281
1894 if ($sym == 13) { 2282 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2283 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2284 my $txt = $self->get_text;
1897 2285
1898 $self->{history_pointer} = -1; 2286 $self->{history_pointer} = -1;
1899 $self->{history_saveback} = ''; 2287 $self->{history_saveback} = '';
1900 $self->emit (activate => $txt); 2288 $self->emit (activate => $txt);
1901 $self->update; 2289 $self->update;
1902 2290
1903 } elsif ($sym == CFClient::SDLK_UP) { 2291 } elsif ($sym == CFPlus::SDLK_UP) {
1904 if ($self->{history_pointer} < 0) { 2292 if ($self->{history_pointer} < 0) {
1905 $self->{history_saveback} = $self->get_text; 2293 $self->{history_saveback} = $self->get_text;
1906 } 2294 }
1907 if (@{$self->{history} || []} > 0) { 2295 if (@{$self->{history} || []} > 0) {
1908 $self->{history_pointer}++; 2296 $self->{history_pointer}++;
… …
1910 $self->{history_pointer} = @{$self->{history} || []} - 1; 2298 $self->{history_pointer} = @{$self->{history} || []} - 1;
1911 } 2299 }
1912 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2300 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1913 } 2301 }
1914 2302
1915 } elsif ($sym == CFClient::SDLK_DOWN) { 2303 } elsif ($sym == CFPlus::SDLK_DOWN) {
1916 $self->{history_pointer}--; 2304 $self->{history_pointer}--;
1917 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2305 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918 2306
1919 if ($self->{history_pointer} >= 0) { 2307 if ($self->{history_pointer} >= 0) {
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2308 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1929 1 2317 1
1930} 2318}
1931 2319
1932############################################################################# 2320#############################################################################
1933 2321
2322package CFPlus::UI::TextEdit;
2323
2324our @ISA = CFPlus::UI::EntryBase::;
2325
2326use CFPlus::OpenGL;
2327
2328sub move_cursor_ver {
2329 my ($self, $dy) = @_;
2330
2331 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2332
2333 $y += $dy;
2334
2335 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2336 $self->{cursor} = $index;
2337 delete $self->{cur_h};
2338 $self->update;
2339 return;
2340 }
2341}
2342
2343sub invoke_key_down {
2344 my ($self, $ev) = @_;
2345
2346 my $sym = $ev->{sym};
2347
2348 if ($sym == CFPlus::SDLK_UP) {
2349 $self->move_cursor_ver (-1);
2350 } elsif ($sym == CFPlus::SDLK_DOWN) {
2351 $self->move_cursor_ver (+1);
2352 } else {
2353 return $self->SUPER::invoke_key_down ($ev)
2354 }
2355
2356 1
2357}
2358
2359#############################################################################
2360
1934package CFClient::UI::Button; 2361package CFPlus::UI::Button;
1935 2362
1936our @ISA = CFClient::UI::Label::; 2363our @ISA = CFPlus::UI::Label::;
1937 2364
1938use CFClient::OpenGL; 2365use CFPlus::OpenGL;
1939 2366
1940my @tex = 2367my @tex =
1941 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942 qw(b1_button_active.png); 2369 qw(b1_button_inactive.png b1_button_active.png);
1943 2370
1944sub new { 2371sub new {
1945 my $class = shift; 2372 my $class = shift;
1946 2373
1947 $class->SUPER::new ( 2374 $class->SUPER::new (
1948 padding_x => 4, 2375 padding_x => 4,
1949 padding_y => 4, 2376 padding_y => 4,
1950 fg => [1, 1, 1], 2377 fg => [1.0, 1.0, 1.0],
1951 active_fg => [0, 0, 1], 2378 active_fg => [0.8, 0.8, 0.8],
1952 can_hover => 1, 2379 can_hover => 1,
1953 align => 0, 2380 align => 0,
1954 valign => 0, 2381 valign => 0,
1955 can_events => 1, 2382 can_events => 1,
1956 @_ 2383 @_
… …
1974 2401
1975 glEnable GL_TEXTURE_2D; 2402 glEnable GL_TEXTURE_2D;
1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2403 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1977 glColor 0, 0, 0, 1; 2404 glColor 0, 0, 0, 1;
1978 2405
2406 my $tex = $tex[$GRAB == $self];
1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2407 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1980 2408
1981 glDisable GL_TEXTURE_2D; 2409 glDisable GL_TEXTURE_2D;
1982 2410
1983 $self->SUPER::_draw; 2411 $self->SUPER::_draw;
1984} 2412}
1985 2413
1986############################################################################# 2414#############################################################################
1987 2415
2416package CFPlus::UI::CheckBox;
2417
2418our @ISA = CFPlus::UI::DrawBG::;
2419
2420my @tex =
2421 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2422 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2423
2424use CFPlus::OpenGL;
2425
2426sub new {
2427 my $class = shift;
2428
2429 $class->SUPER::new (
2430 padding_x => 2,
2431 padding_y => 2,
2432 fg => [1, 1, 1],
2433 active_fg => [1, 1, 0],
2434 bg => [0, 0, 0, 0.2],
2435 active_bg => [1, 1, 1, 0.5],
2436 state => 0,
2437 can_hover => 1,
2438 @_
2439 )
2440}
2441
2442sub size_request {
2443 my ($self) = @_;
2444
2445 (6) x 2
2446}
2447
2448sub toggle {
2449 my ($self) = @_;
2450
2451 $self->{state} = !$self->{state};
2452 $self->emit (changed => $self->{state});
2453 $self->update;
2454}
2455
2456sub invoke_button_down {
2457 my ($self, $ev, $x, $y) = @_;
2458
2459 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2460 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2461 $self->toggle;
2462 } else {
2463 return 0
2464 }
2465
2466 1
2467}
2468
2469sub _draw {
2470 my ($self) = @_;
2471
2472 $self->SUPER::_draw;
2473
2474 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2475
2476 my ($w, $h) = @$self{qw(w h)};
2477
2478 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2479
2480 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2481
2482 my $tex = $self->{state} ? $tex[1] : $tex[0];
2483
2484 glEnable GL_TEXTURE_2D;
2485 $tex->draw_quad_alpha (0, 0, $s, $s);
2486 glDisable GL_TEXTURE_2D;
2487}
2488
2489#############################################################################
2490
2491package CFPlus::UI::Image;
2492
2493our @ISA = CFPlus::UI::Base::;
2494
2495use CFPlus::OpenGL;
2496
2497our %texture_cache;
2498
2499sub new {
2500 my $class = shift;
2501
2502 my $self = $class->SUPER::new (
2503 can_events => 0,
2504 @_,
2505 );
2506
2507 $self->{path} || $self->{tex}
2508 or Carp::croak "'path' or 'tex' attributes required";
2509
2510 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2511 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2512
2513 CFPlus::weaken $texture_cache{$self->{path}};
2514
2515 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2516
2517 $self
2518}
2519
2520sub STORABLE_freeze {
2521 my ($self, $cloning) = @_;
2522
2523 $self->{path}
2524 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2525
2526 $self->{path}
2527}
2528
2529sub STORABLE_attach {
2530 my ($self, $cloning, $path) = @_;
2531
2532 $self->new (path => $path)
2533}
2534
2535sub size_request {
2536 my ($self) = @_;
2537
2538 ($self->{tex}{w}, $self->{tex}{h})
2539}
2540
2541sub _draw {
2542 my ($self) = @_;
2543
2544 my $tex = $self->{tex};
2545
2546 my ($w, $h) = ($self->{w}, $self->{h});
2547
2548 if ($self->{rot90}) {
2549 glRotate 90, 0, 0, 1;
2550 glTranslate 0, -$self->{w}, 0;
2551
2552 ($w, $h) = ($h, $w);
2553 }
2554
2555 glEnable GL_TEXTURE_2D;
2556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2557
2558 $tex->draw_quad (0, 0, $w, $h);
2559
2560 glDisable GL_TEXTURE_2D;
2561}
2562
2563#############################################################################
2564
1988package CFClient::UI::ImageButton; 2565package CFPlus::UI::ImageButton;
1989 2566
1990our @ISA = CFClient::UI::Image::; 2567our @ISA = CFPlus::UI::Image::;
1991 2568
1992use CFClient::OpenGL; 2569use CFPlus::OpenGL;
1993 2570
1994my %textures; 2571my %textures;
1995 2572
1996sub new { 2573sub new {
1997 my $class = shift; 2574 my $class = shift;
… …
2019 1 2596 1
2020} 2597}
2021 2598
2022############################################################################# 2599#############################################################################
2023 2600
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; 2601package CFPlus::UI::VGauge;
2093 2602
2094our @ISA = CFClient::UI::Base::; 2603our @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 2604
2155use List::Util qw(min max); 2605use List::Util qw(min max);
2156 2606
2157use CFClient::OpenGL; 2607use CFPlus::OpenGL;
2158 2608
2159my %tex = ( 2609my %tex = (
2160 food => [ 2610 food => [
2161 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2611 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2162 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2612 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2163 ], 2613 ],
2164 grace => [ 2614 grace => [
2165 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2615 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/ 2616 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2167 ], 2617 ],
2168 hp => [ 2618 hp => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2619 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2620 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2171 ], 2621 ],
2172 mana => [ 2622 mana => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2623 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/ 2624 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2175 ], 2625 ],
2176); 2626);
2177 2627
2178# eg. VGauge->new (gauge => 'food'), default gauge: food 2628# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2238 my $ycut1 = max 0, min 1, $ycut; 2688 my $ycut1 = max 0, min 1, $ycut;
2239 my $ycut2 = max 0, min 1, $ycut - 1; 2689 my $ycut2 = max 0, min 1, $ycut - 1;
2240 2690
2241 my $h1 = $self->{h} * (1 - $ycut1); 2691 my $h1 = $self->{h} * (1 - $ycut1);
2242 my $h2 = $self->{h} * (1 - $ycut2); 2692 my $h2 = $self->{h} * (1 - $ycut2);
2693 my $h3 = $self->{h};
2694
2695 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243 2696
2244 glEnable GL_BLEND; 2697 glEnable GL_BLEND;
2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2698 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2699 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glEnable GL_TEXTURE_2D; 2700 glEnable GL_TEXTURE_2D;
… …
2266 2719
2267 if ($t3) { 2720 if ($t3) {
2268 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2721 glBindTexture GL_TEXTURE_2D, $t3->{name};
2269 glBegin GL_QUADS; 2722 glBegin GL_QUADS;
2270 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2723 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2724 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2725 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2726 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274 glEnd; 2727 glEnd;
2275 } 2728 }
2276 2729
2277 glDisable GL_BLEND; 2730 glDisable GL_BLEND;
2278 glDisable GL_TEXTURE_2D; 2731 glDisable GL_TEXTURE_2D;
2279} 2732}
2280 2733
2281############################################################################# 2734#############################################################################
2282 2735
2283package CFClient::UI::Gauge; 2736package CFPlus::UI::Gauge;
2284 2737
2285our @ISA = CFClient::UI::VBox::; 2738our @ISA = CFPlus::UI::VBox::;
2286 2739
2287sub new { 2740sub new {
2288 my ($class, %arg) = @_; 2741 my ($class, %arg) = @_;
2289 2742
2290 my $self = $class->SUPER::new ( 2743 my $self = $class->SUPER::new (
… …
2292 can_hover => 1, 2745 can_hover => 1,
2293 can_events => 1, 2746 can_events => 1,
2294 %arg, 2747 %arg,
2295 ); 2748 );
2296 2749
2297 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2750 $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); 2751 $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"); 2752 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2300 2753
2301 $self 2754 $self
2302} 2755}
2303 2756
2304sub set_fontsize { 2757sub set_fontsize {
… …
2325 $self->{value}->set_text ($val); 2778 $self->{value}->set_text ($val);
2326} 2779}
2327 2780
2328############################################################################# 2781#############################################################################
2329 2782
2330package CFClient::UI::Slider; 2783package CFPlus::UI::Slider;
2331 2784
2332use strict; 2785use strict;
2333 2786
2334use CFClient::OpenGL; 2787use CFPlus::OpenGL;
2335 2788
2336our @ISA = CFClient::UI::DrawBG::; 2789our @ISA = CFPlus::UI::DrawBG::;
2337 2790
2338my @tex = 2791my @tex =
2339 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2792 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2340 qw(s1_slider.png s1_slider_bg.png); 2793 qw(s1_slider.png s1_slider_bg.png);
2341 2794
2342sub new { 2795sub new {
2343 my $class = shift; 2796 my $class = shift;
2344 2797
… …
2433 } 2886 }
2434 2887
2435 1 2888 1
2436} 2889}
2437 2890
2891sub invoke_mouse_wheel {
2892 my ($self, $ev) = @_;
2893
2894 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2895
2896 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2897
2898 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2899
2900 ! ! $delta
2901}
2902
2438sub update { 2903sub update {
2439 my ($self) = @_; 2904 my ($self) = @_;
2440 2905
2441 delete $self->{knob_w}; 2906 delete $self->{knob_w};
2442 $self->SUPER::update; 2907 $self->SUPER::update;
… …
2489 glDisable GL_TEXTURE_2D; 2954 glDisable GL_TEXTURE_2D;
2490} 2955}
2491 2956
2492############################################################################# 2957#############################################################################
2493 2958
2494package CFClient::UI::ValSlider; 2959package CFPlus::UI::ValSlider;
2495 2960
2496our @ISA = CFClient::UI::HBox::; 2961our @ISA = CFPlus::UI::HBox::;
2497 2962
2498sub new { 2963sub new {
2499 my ($class, %arg) = @_; 2964 my ($class, %arg) = @_;
2500 2965
2501 my $range = delete $arg{range}; 2966 my $range = delete $arg{range};
2502 2967
2503 my $self = $class->SUPER::new ( 2968 my $self = $class->SUPER::new (
2504 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2969 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2505 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2970 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2506 to_value => sub { shift }, 2971 to_value => sub { shift },
2507 from_value => sub { shift }, 2972 from_value => sub { shift },
2508 %arg, 2973 %arg,
2509 ); 2974 );
2510 2975
… …
2530sub set_range { shift->{slider}->set_range (@_) } 2995sub set_range { shift->{slider}->set_range (@_) }
2531sub set_value { shift->{slider}->set_value (@_) } 2996sub set_value { shift->{slider}->set_value (@_) }
2532 2997
2533############################################################################# 2998#############################################################################
2534 2999
2535package CFClient::UI::TextScroller; 3000package CFPlus::UI::TextScroller;
2536 3001
2537our @ISA = CFClient::UI::HBox::; 3002our @ISA = CFPlus::UI::HBox::;
2538 3003
2539use CFClient::OpenGL; 3004use CFPlus::OpenGL;
2540 3005
2541sub new { 3006sub new {
2542 my $class = shift; 3007 my $class = shift;
2543 3008
2544 my $self = $class->SUPER::new ( 3009 my $self = $class->SUPER::new (
2545 fontsize => 1, 3010 fontsize => 1,
2546 can_events => 0, 3011 can_events => 1,
2547 indent => 0, 3012 indent => 0,
2548 #font => default_font 3013 #font => default_font
2549 @_, 3014 @_,
2550 3015
2551 layout => (new CFClient::Layout 1), 3016 layout => (new CFPlus::Layout),
2552 par => [], 3017 par => [],
3018 max_par => 0,
2553 height => 0, 3019 height => 0,
2554 children => [ 3020 children => [
2555 (new CFClient::UI::Empty expand => 1), 3021 (new CFPlus::UI::Empty expand => 1),
2556 (new CFClient::UI::Slider vertical => 1), 3022 (new CFPlus::UI::Slider vertical => 1),
2557 ], 3023 ],
2558 ); 3024 );
2559 3025
2560 $self->{children}[1]->connect (changed => sub { $self->update }); 3026 $self->{children}[1]->connect (changed => sub { $self->update });
2561 3027
… …
2567 3033
2568 $self->{fontsize} = $fontsize; 3034 $self->{fontsize} = $fontsize;
2569 $self->reflow; 3035 $self->reflow;
2570} 3036}
2571 3037
2572sub visible_children { 3038sub size_request {
2573 my ($self) = @_; 3039 my ($self) = @_;
2574 3040
2575 @{$self->{children}}[0,1] 3041 my ($empty, $slider) = @{ $self->{children} };
3042
3043 local $self->{children} = [$empty, $slider];
3044 $self->SUPER::size_request
2576} 3045}
2577 3046
2578sub invoke_size_allocate { 3047sub invoke_size_allocate {
2579 my ($self, $w, $h) = @_; 3048 my ($self, $w, $h) = @_;
2580 3049
2581 my (undef, undef, @other) = @{ $self->{children} }; 3050 my ($empty, $slider, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other; 3051 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583 3052
2584 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3053 $self->{layout}->set_font ($self->{font}) if $self->{font};
2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3054 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586 $self->{layout}->set_width ($self->{children}[0]{w}); 3055 $self->{layout}->set_width ($empty->{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3056 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588 3057
2589 $self->reflow; 3058 $self->reflow;
2590 3059
3060 local $self->{children} = [$empty, $slider];
2591 $self->SUPER::invoke_size_allocate ($w, $h) 3061 $self->SUPER::invoke_size_allocate ($w, $h)
3062}
3063
3064sub invoke_mouse_wheel {
3065 my ($self, $ev) = @_;
3066
3067 return 0 unless $ev->{dy}; # only vertical movements
3068
3069 $self->{children}[1]->emit (mouse_wheel => $ev);
3070
3071 1
2592} 3072}
2593 3073
2594sub get_layout { 3074sub get_layout {
2595 my ($self, $para) = @_; 3075 my ($self, $para) = @_;
2596 3076
2597 my $layout = $self->{layout}; 3077 my $layout = $self->{layout};
2598 3078
2599 $layout->set_font ($self->{font}) if $self->{font}; 3079 $layout->set_font ($self->{font}) if $self->{font};
3080 $layout->set_foreground (@{$para->{fg}});
2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3081 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent}); 3082 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3083 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603 $layout->set_markup ($para->{markup}); 3084 $layout->set_markup ($para->{markup});
2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}}); 3085
3086 $layout->set_shapes (
3087 map
3088 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3089 @{$para->{widget}}
3090 );
2605 3091
2606 $layout 3092 $layout
2607} 3093}
2608 3094
2609sub reflow { 3095sub reflow {
… …
2616sub set_offset { 3102sub set_offset {
2617 my ($self, $offset) = @_; 3103 my ($self, $offset) = @_;
2618 3104
2619 # todo: base offset on lines or so, not on pixels 3105 # todo: base offset on lines or so, not on pixels
2620 $self->{children}[1]->set_value ($offset); 3106 $self->{children}[1]->set_value ($offset);
3107}
3108
3109sub current_paragraph {
3110 my ($self) = @_;
3111
3112 $self->{top_paragraph} - 1
3113}
3114
3115sub scroll_to {
3116 my ($self, $para) = @_;
3117
3118 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3119
3120 $self->{scroll_to} = $para;
3121 $self->update;
2621} 3122}
2622 3123
2623sub clear { 3124sub clear {
2624 my ($self) = @_; 3125 my ($self) = @_;
2625 3126
… …
2630 $self->{height} = 0; 3131 $self->{height} = 0;
2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3132 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2632} 3133}
2633 3134
2634sub add_paragraph { 3135sub add_paragraph {
2635 my ($self, $color, $para, $indent) = @_; 3136 my $self = shift;
2636 3137
2637 my ($text, @w) = ref $para ? @$para : $para; 3138 for my $para (@_) {
2638
2639 $para = { 3139 $para = {
3140 fg => [1, 1, 1, 1],
3141 indent => 0,
3142 markup => "",
3143 widget => [],
3144 ref $para ? %$para : (markup => $para),
2640 w => 1e10, 3145 w => 1e10,
2641 wrapped => 1, 3146 wrapped => 1,
2642 fg => $color,
2643 indent => $indent,
2644 markup => $text,
2645 widget => \@w,
2646 }; 3147 };
2647 3148
2648 $self->add (@w) if @w; 3149 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2649 push @{$self->{par}}, $para; 3150 push @{$self->{par}}, $para;
3151 }
3152
3153 if (my $max = $self->{max_par}) {
3154 shift @{$self->{par}} while @{$self->{par}} > $max;
3155 }
2650 3156
2651 $self->{need_reflow}++; 3157 $self->{need_reflow}++;
2652 $self->update; 3158 $self->update;
2653} 3159}
2654 3160
2655sub scroll_to_bottom { 3161sub scroll_to_bottom {
2656 my ($self) = @_; 3162 my ($self) = @_;
2657 3163
2658 $self->{scroll_to_bottom} = 1; 3164 $self->{scroll_to} = $#{$self->{par}};
2659 $self->update; 3165 $self->update;
2660} 3166}
2661 3167
3168sub force_uptodate {
3169 my ($self) = @_;
3170
3171 if (delete $self->{need_reflow}) {
3172 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3173
3174 my $height = 0;
3175
3176 for my $para (@{$self->{par}}) {
3177 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3178 my $layout = $self->get_layout ($para);
3179 my ($w, $h) = $layout->size;
3180
3181 $para->{w} = $w + $para->{indent};
3182 $para->{h} = $h;
3183 $para->{wrapped} = $layout->has_wrapped;
3184 }
3185
3186 $para->{y} = $height;
3187 $height += $para->{h};
3188 }
3189
3190 $self->{height} = $height;
3191 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3192
3193 delete $self->{texture};
3194 }
3195
3196 if (my $paridx = delete $self->{scroll_to}) {
3197 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3198 }
3199}
3200
2662sub update { 3201sub update {
2663 my ($self) = @_; 3202 my ($self) = @_;
2664 3203
2665 $self->SUPER::update; 3204 $self->SUPER::update;
2666 3205
2667 return unless $self->{h} > 0; 3206 return unless $self->{h} > 0;
2668 3207
2669 delete $self->{texture}; 3208 delete $self->{texture};
2670 3209
2671 $ROOT->on_post_alloc ($self => sub { 3210 $ROOT->on_post_alloc ($self => sub {
3211 $self->force_uptodate;
3212
2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3213 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2673 3214
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 { 3215 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2702 glClearColor 0, 0, 0, 0; 3216 glClearColor 0, 0, 0, 0;
2703 glClear GL_COLOR_BUFFER_BIT; 3217 glClear GL_COLOR_BUFFER_BIT;
2704 3218
3219 package CFPlus::UI::Base;
3220 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3221 (0, 0, $self->{w}, $self->{h});
3222
3223 my $top = int $self->{children}[1]{range}[0];
3224
3225 my $paridx = 0;
3226 my $top_paragraph;
2705 my $top = int $self->{children}[1]{range}[0]; 3227 my $top = int $self->{children}[1]{range}[0];
2706 3228
2707 my $y0 = $top; 3229 my $y0 = $top;
2708 my $y1 = $top + $H; 3230 my $y1 = $top + $H;
2709 3231
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}}) { 3232 for my $para (@{$self->{par}}) {
2717 my $h = $para->{h}; 3233 my $h = $para->{h};
3234 my $y = $para->{y};
2718 3235
2719 if ($y0 < $y + $h && $y < $y1) { 3236 if ($y0 < $y + $h && $y < $y1) {
2720
2721 my $layout = $self->get_layout ($para); 3237 my $layout = $self->get_layout ($para);
2722 3238
2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725 glRasterPos $para->{indent}, $y - $y0; 3239 $layout->render ($para->{indent}, $y - $y0);
2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727 3240
2728 if (my @w = @{ $para->{widget} }) { 3241 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes; 3242 my @s = $layout->get_shapes;
2730 3243
2731 for (@w) { 3244 for (@w) {
… …
2737 $_->draw; 3250 $_->draw;
2738 } 3251 }
2739 } 3252 }
2740 } 3253 }
2741 3254
2742 $y += $h; 3255 $paridx++;
3256 $top_paragraph ||= $paridx if $y >= $top;
2743 } 3257 }
2744 3258
2745 glDisable GL_BLEND; 3259 $self->{top_paragraph} = $top_paragraph;
2746 }; 3260 };
2747 }); 3261 });
2748} 3262}
2749 3263
2750sub reconfigure { 3264sub reconfigure {
… …
2768 $self->{children}[1]->draw; 3282 $self->{children}[1]->draw;
2769} 3283}
2770 3284
2771############################################################################# 3285#############################################################################
2772 3286
2773package CFClient::UI::Animator; 3287package CFPlus::UI::Animator;
2774 3288
2775use CFClient::OpenGL; 3289use CFPlus::OpenGL;
2776 3290
2777our @ISA = CFClient::UI::Bin::; 3291our @ISA = CFPlus::UI::Bin::;
2778 3292
2779sub moveto { 3293sub moveto {
2780 my ($self, $x, $y) = @_; 3294 my ($self, $x, $y) = @_;
2781 3295
2782 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3296 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2810 glPopMatrix; 3324 glPopMatrix;
2811} 3325}
2812 3326
2813############################################################################# 3327#############################################################################
2814 3328
2815package CFClient::UI::Flopper; 3329package CFPlus::UI::Flopper;
2816 3330
2817our @ISA = CFClient::UI::Button::; 3331our @ISA = CFPlus::UI::Button::;
2818 3332
2819sub new { 3333sub new {
2820 my $class = shift; 3334 my $class = shift;
2821 3335
2822 my $self = $class->SUPER::new ( 3336 my $self = $class->SUPER::new (
… …
2834 $self->{other}->toggle_visibility; 3348 $self->{other}->toggle_visibility;
2835} 3349}
2836 3350
2837############################################################################# 3351#############################################################################
2838 3352
2839package CFClient::UI::Tooltip; 3353package CFPlus::UI::Tooltip;
2840 3354
2841our @ISA = CFClient::UI::Bin::; 3355our @ISA = CFPlus::UI::Bin::;
2842 3356
2843use CFClient::OpenGL; 3357use CFPlus::OpenGL;
2844 3358
2845sub new { 3359sub new {
2846 my $class = shift; 3360 my $class = shift;
2847 3361
2848 $class->SUPER::new ( 3362 $class->SUPER::new (
… …
2851 ) 3365 )
2852} 3366}
2853 3367
2854sub set_tooltip_from { 3368sub set_tooltip_from {
2855 my ($self, $widget) = @_; 3369 my ($self, $widget) = @_;
3370
3371 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3372 if $widget->{tooltip} =~ /^#(.*)$/;
2856 3373
2857 my $tooltip = $widget->{tooltip}; 3374 my $tooltip = $widget->{tooltip};
2858 3375
2859 if ($ENV{CFPLUS_DEBUG} & 2) { 3376 if ($ENV{CFPLUS_DEBUG} & 2) {
2860 $tooltip .= "\n\n" . (ref $widget) . "\n" 3377 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2864 } 3381 }
2865 3382
2866 $tooltip =~ s/^\n+//; 3383 $tooltip =~ s/^\n+//;
2867 $tooltip =~ s/\n+$//; 3384 $tooltip =~ s/\n+$//;
2868 3385
2869 $self->add (new CFClient::UI::Label 3386 $self->add (new CFPlus::UI::Label
2870 markup => $tooltip, 3387 markup => $tooltip,
2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3388 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2872 fontsize => 0.8, 3389 fontsize => 0.8,
2873 fg => [0, 0, 0, 1], 3390 style => 1, # FLAG_INVERSE
2874 ellipsise => 0, 3391 ellipsise => 0,
2875 font => ($widget->{tooltip_font} || $::FONT_PROP), 3392 font => ($widget->{tooltip_font} || $::FONT_PROP),
2876 ); 3393 );
2877} 3394}
2878 3395
… …
2897 3414
2898 $self->{root}->on_post_alloc ("move_$self" => sub { 3415 $self->{root}->on_post_alloc ("move_$self" => sub {
2899 my $widget = $self->{owner} 3416 my $widget = $self->{owner}
2900 or return; 3417 or return;
2901 3418
3419 if ($widget->{visible}) {
2902 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3420 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2903 3421
2904 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3422 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2905 if $x + $self->{w} > $self->{root}{w}; 3423 if $x + $self->{w} > $self->{root}{w};
2906 3424
2907 $self->move_abs ($x, $y); 3425 $self->move_abs ($x, $y);
3426 } else {
3427 $self->hide;
3428 }
2908 }); 3429 });
2909} 3430}
2910 3431
2911sub _draw { 3432sub _draw {
2912 my ($self) = @_; 3433 my ($self) = @_;
… …
2936 $self->SUPER::_draw; 3457 $self->SUPER::_draw;
2937} 3458}
2938 3459
2939############################################################################# 3460#############################################################################
2940 3461
2941package CFClient::UI::Face; 3462package CFPlus::UI::Face;
2942 3463
2943our @ISA = CFClient::UI::Base::; 3464our @ISA = CFPlus::UI::DrawBG::;
2944 3465
2945use CFClient::OpenGL; 3466use CFPlus::OpenGL;
2946 3467
2947sub new { 3468sub new {
2948 my $class = shift; 3469 my $class = shift;
2949 3470
2950 my $self = $class->SUPER::new ( 3471 my $self = $class->SUPER::new (
3472 size_w => 32,
3473 size_h => 8,
2951 aspect => 1, 3474 aspect => 1,
2952 can_events => 0, 3475 can_events => 0,
2953 @_, 3476 @_,
2954 ); 3477 );
2955 3478
2956 if ($self->{anim} && $self->{animspeed}) { 3479 if ($self->{anim} && $self->{animspeed}) {
2957 Scalar::Util::weaken (my $widget = $self); 3480 CFPlus::weaken (my $widget = $self);
2958 3481
3482 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3483 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2959 $self->{timer} = Event->timer ( 3484 $self->{timer} = Event->timer (
2960 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2961 hard => 1, 3485 parked => 1,
2962 interval => $self->{animspeed},
2963 cb => sub { 3486 cb => sub {
3487 return unless $::CONN && $widget;
3488
2964 ++$widget->{frame}; 3489 ++$widget->{frame};
3490 $widget->update_face;
2965 $widget->update; 3491 $widget->update;
3492
3493 $widget->update_timer;
2966 }, 3494 },
2967 ); 3495 );
3496
3497 $self->update_face;
3498 $self->update_timer;
2968 } 3499 }
2969 3500
2970 $self 3501 $self
2971} 3502}
2972 3503
3504sub update_timer {
3505 my ($self) = @_;
3506
3507 return unless $self->{timer};
3508
3509 if ($self->{visible}) {
3510 $self->{timer}->at (
3511 $self->{anim_start}
3512 + $self->{animspeed}
3513 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3514 );
3515 $self->{timer}->start;
3516 } else {
3517 $self->{timer}->stop;
3518 }
3519}
3520
3521sub update_face {
3522 my ($self) = @_;
3523
3524 return unless $::CONN;
3525
3526 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3527 if ($anim && @$anim) {
3528 delete $self->{wait_face};
3529 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3530 }
3531 }
3532}
3533
2973sub size_request { 3534sub size_request {
2974 (32, 8) 3535 my ($self) = @_;
3536
3537 if ($::CONN) {
3538 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3539 if (my $tex = $::CONN->{texture}[$faceid]) {
3540 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3541 } else {
3542 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3543 $self->realloc;
3544 });
3545 }
3546 }
3547 }
3548
3549 ($self->{size_w} || 8, $self->{size_h} || 8)
2975} 3550}
2976 3551
2977sub update { 3552sub update {
2978 my ($self) = @_; 3553 my ($self) = @_;
2979 3554
2980 return unless $self->{visible}; 3555 return unless $self->{visible};
2981 3556
2982 $self->SUPER::update; 3557 $self->SUPER::update;
2983} 3558}
2984 3559
3560sub invoke_visibility_change {
3561 my ($self) = @_;
3562
3563 $self->update_timer;
3564
3565 0
3566}
3567
2985sub _draw { 3568sub _draw {
2986 my ($self) = @_; 3569 my ($self) = @_;
2987 3570
2988 return unless $::CONN; 3571 return unless $::CONN;
2989 3572
2990 my $face; 3573 $self->SUPER::_draw;
2991 3574
2992 if ($self->{frame}) {
2993 my $anim = $::CONN->{anim}[$self->{anim}]; 3575 my $faceid = $::CONN->{faceid}[$self->{face}]
2994 3576 or return;
2995 $face = $anim->[ $self->{frame} % @$anim ]
2996 if $anim && @$anim;
2997 }
2998 3577
2999 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3578 my $tex = $::CONN->{texture}[$faceid];
3000 3579
3001 if ($tex) { 3580 if ($tex) {
3002 glEnable GL_TEXTURE_2D; 3581 glEnable GL_TEXTURE_2D;
3003 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3004 glColor 0, 0, 0, 1; 3583 glColor 0, 0, 0, 1;
… …
3008} 3587}
3009 3588
3010sub destroy { 3589sub destroy {
3011 my ($self) = @_; 3590 my ($self) = @_;
3012 3591
3013 $self->{timer}->cancel 3592 (delete $self->{timer})->cancel
3014 if $self->{timer}; 3593 if $self->{timer};
3015 3594
3016 $self->SUPER::destroy; 3595 $self->SUPER::destroy;
3017} 3596}
3018 3597
3019############################################################################# 3598#############################################################################
3020 3599
3021package CFClient::UI::Buttonbar; 3600package CFPlus::UI::Buttonbar;
3022 3601
3023our @ISA = CFClient::UI::HBox::; 3602our @ISA = CFPlus::UI::HBox::;
3024 3603
3025# TODO: should actualyl wrap buttons and other goodies. 3604# TODO: should actually wrap buttons and other goodies.
3026 3605
3027############################################################################# 3606#############################################################################
3028 3607
3029package CFClient::UI::Menu; 3608package CFPlus::UI::Menu;
3030 3609
3031our @ISA = CFClient::UI::FancyFrame::; 3610our @ISA = CFPlus::UI::Toplevel::;
3032 3611
3033use CFClient::OpenGL; 3612use CFPlus::OpenGL;
3034 3613
3035sub new { 3614sub new {
3036 my $class = shift; 3615 my $class = shift;
3037 3616
3038 my $self = $class->SUPER::new ( 3617 my $self = $class->SUPER::new (
3039 items => [], 3618 items => [],
3040 z => 100, 3619 z => 100,
3041 @_, 3620 @_,
3042 ); 3621 );
3043 3622
3044 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3623 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3045 3624
3046 for my $item (@{ $self->{items} }) { 3625 for my $item (@{ $self->{items} }) {
3047 my ($widget, $cb, $tooltip) = @$item; 3626 my ($widget, $cb, $tooltip) = @$item;
3048 3627
3049 # handle various types of items, only text for now 3628 # handle various types of items, only text for now
3050 if (!ref $widget) { 3629 if (!ref $widget) {
3630 if ($widget =~ /\t/) {
3631 my ($left, $right) = split /\t/, $widget, 2;
3632
3051 $widget = new CFClient::UI::Label 3633 $widget = new CFPlus::UI::HBox
3052 can_hover => 1, 3634 can_hover => 1,
3053 can_events => 1, 3635 can_events => 1,
3636 tooltip => $tooltip,
3637 children => [
3638 (new CFPlus::UI::Label markup => $left, expand => 1),
3639 (new CFPlus::UI::Label markup => $right, align => +1),
3640 ],
3641 ;
3642
3643 } else {
3644 $widget = new CFPlus::UI::Label
3645 can_hover => 1,
3646 can_events => 1,
3054 markup => $widget, 3647 markup => $widget,
3055 tooltip => $tooltip 3648 tooltip => $tooltip;
3649 }
3056 } 3650 }
3057 3651
3058 $self->{item}{$widget} = $item; 3652 $self->{item}{$widget} = $item;
3059 3653
3060 $self->{vbox}->add ($widget); 3654 $self->{vbox}->add ($widget);
… …
3103 1 3697 1
3104} 3698}
3105 3699
3106############################################################################# 3700#############################################################################
3107 3701
3108package CFClient::UI::Multiplexer; 3702package CFPlus::UI::Multiplexer;
3109 3703
3110our @ISA = CFClient::UI::Container::; 3704our @ISA = CFPlus::UI::Container::;
3111 3705
3112sub new { 3706sub new {
3113 my $class = shift; 3707 my $class = shift;
3114 3708
3115 my $self = $class->SUPER::new ( 3709 my $self = $class->SUPER::new (
… …
3129 3723
3130 $self->{current} = $self->{children}[0] 3724 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} }; 3725 if @{ $self->{children} };
3132} 3726}
3133 3727
3728sub get_current_page {
3729 my ($self) = @_;
3730
3731 $self->{current}
3732}
3733
3134sub set_current_page { 3734sub set_current_page {
3135 my ($self, $page_or_widget) = @_; 3735 my ($self, $page_or_widget) = @_;
3136 3736
3137 my $widget = ref $page_or_widget 3737 my $widget = ref $page_or_widget
3138 ? $page_or_widget 3738 ? $page_or_widget
… …
3170 $self->{current}->draw; 3770 $self->{current}->draw;
3171} 3771}
3172 3772
3173############################################################################# 3773#############################################################################
3174 3774
3175package CFClient::UI::Notebook; 3775package CFPlus::UI::Notebook;
3176 3776
3177our @ISA = CFClient::UI::VBox::; 3777our @ISA = CFPlus::UI::VBox::;
3178 3778
3179sub new { 3779sub new {
3180 my $class = shift; 3780 my $class = shift;
3181 3781
3182 my $self = $class->SUPER::new ( 3782 my $self = $class->SUPER::new (
3183 buttonbar => (new CFClient::UI::Buttonbar), 3783 buttonbar => (new CFPlus::UI::Buttonbar),
3184 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3784 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3185 # filter => # will be put between multiplexer and $self 3785 # filter => # will be put between multiplexer and $self
3186 @_, 3786 @_,
3187 ); 3787 );
3188 3788
3189 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3789 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3193} 3793}
3194 3794
3195sub add { 3795sub add {
3196 my ($self, $title, $widget, $tooltip) = @_; 3796 my ($self, $title, $widget, $tooltip) = @_;
3197 3797
3198 Scalar::Util::weaken $self; 3798 CFPlus::weaken $self;
3199 3799
3200 $self->{buttonbar}->add (new CFClient::UI::Button 3800 $self->{buttonbar}->add (new CFPlus::UI::Button
3201 markup => $title, 3801 markup => $title,
3202 tooltip => $tooltip, 3802 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) }, 3803 on_activate => sub { $self->set_current_page ($widget) },
3204 ); 3804 );
3205 3805
3206 $self->{multiplexer}->add ($widget); 3806 $self->{multiplexer}->add ($widget);
3207} 3807}
3208 3808
3809sub get_current_page {
3810 my ($self) = @_;
3811
3812 $self->{multiplexer}->get_current_page
3813}
3814
3209sub set_current_page { 3815sub set_current_page {
3210 my ($self, $page) = @_; 3816 my ($self, $page) = @_;
3211 3817
3212 $self->{multiplexer}->set_current_page ($page); 3818 $self->{multiplexer}->set_current_page ($page);
3213 $self->emit (page_changed => $self->{multiplexer}{current}); 3819 $self->emit (page_changed => $self->{multiplexer}{current});
3214} 3820}
3215 3821
3216############################################################################# 3822#############################################################################
3217 3823
3218package CFClient::UI::Combobox; 3824package CFPlus::UI::Selector;
3219 3825
3220use utf8; 3826use utf8;
3221 3827
3222our @ISA = CFClient::UI::Button::; 3828our @ISA = CFPlus::UI::Button::;
3223 3829
3224sub new { 3830sub new {
3225 my $class = shift; 3831 my $class = shift;
3226 3832
3227 my $self = $class->SUPER::new ( 3833 my $self = $class->SUPER::new (
… …
3244 my ($value, $title, $tooltip) = @$_; 3850 my ($value, $title, $tooltip) = @$_;
3245 3851
3246 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3852 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247 } 3853 }
3248 3854
3249 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3855 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250} 3856}
3251 3857
3252sub _set_value { 3858sub _set_value {
3253 my ($self, $value) = @_; 3859 my ($self, $value) = @_;
3254 3860
… …
3269 $self->emit (changed => $value); 3875 $self->emit (changed => $value);
3270} 3876}
3271 3877
3272############################################################################# 3878#############################################################################
3273 3879
3274package CFClient::UI::Statusbox; 3880package CFPlus::UI::Statusbox;
3275 3881
3276our @ISA = CFClient::UI::VBox::; 3882our @ISA = CFPlus::UI::VBox::;
3277 3883
3278sub new { 3884sub new {
3279 my $class = shift; 3885 my $class = shift;
3280 3886
3281 my $self = $class->SUPER::new ( 3887 my $self = $class->SUPER::new (
3282 fontsize => 0.8, 3888 fontsize => 0.8,
3283 @_, 3889 @_,
3284 ); 3890 );
3285 3891
3286 Scalar::Util::weaken (my $this = $self); 3892 CFPlus::weaken (my $this = $self);
3287 3893
3288 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3894 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3289 3895
3290 $self 3896 $self
3291} 3897}
… …
3293sub reorder { 3899sub reorder {
3294 my ($self) = @_; 3900 my ($self) = @_;
3295 my $NOW = Time::HiRes::time; 3901 my $NOW = Time::HiRes::time;
3296 3902
3297 # freeze display when hovering over any label 3903 # freeze display when hovering over any label
3298 return if $CFClient::UI::TOOLTIP->{owner} 3904 return if $CFPlus::UI::TOOLTIP->{owner}
3299 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3905 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3300 values %{ $self->{item} }; 3906 values %{ $self->{item} };
3301 3907
3302 while (my ($k, $v) = each %{ $self->{item} }) { 3908 while (my ($k, $v) = each %{ $self->{item} }) {
3303 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3909 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3304 } 3910 }
… …
3325 for ($short) { 3931 for ($short) {
3326 s/^\s+//; 3932 s/^\s+//;
3327 s/\s+/ /g; 3933 s/\s+/ /g;
3328 } 3934 }
3329 3935
3330 new CFClient::UI::Label 3936 new CFPlus::UI::Label
3331 markup => $short, 3937 markup => $short,
3332 tooltip => $item->{tooltip}, 3938 tooltip => $item->{tooltip},
3333 tooltip_font => $::FONT_PROP, 3939 tooltip_font => $::FONT_PROP,
3334 tooltip_width => 0.67, 3940 tooltip_width => 0.67,
3335 fontsize => $item->{fontsize} || $self->{fontsize}, 3941 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3389 count => 1, 3995 count => 1,
3390 %arg, 3996 %arg,
3391 }; 3997 };
3392 } 3998 }
3393 3999
4000 $ROOT->on_refresh (reorder => sub {
3394 $self->reorder; 4001 $self->reorder;
4002 });
3395} 4003}
3396 4004
3397sub reconfigure { 4005sub reconfigure {
3398 my ($self) = @_; 4006 my ($self) = @_;
3399 4007
… …
3412 $self->SUPER::destroy; 4020 $self->SUPER::destroy;
3413} 4021}
3414 4022
3415############################################################################# 4023#############################################################################
3416 4024
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; 4025package CFPlus::UI::Root;
3790 4026
3791our @ISA = CFClient::UI::Container::; 4027our @ISA = CFPlus::UI::Container::;
3792 4028
3793use List::Util qw(min max); 4029use List::Util qw(min max);
3794 4030
3795use CFClient::OpenGL; 4031use CFPlus::OpenGL;
3796 4032
3797sub new { 4033sub new {
3798 my $class = shift; 4034 my $class = shift;
3799 4035
3800 my $self = $class->SUPER::new ( 4036 my $self = $class->SUPER::new (
3801 visible => 1, 4037 visible => 1,
3802 @_, 4038 @_,
3803 ); 4039 );
3804 4040
3805 Scalar::Util::weaken ($self->{root} = $self); 4041 CFPlus::weaken ($self->{root} = $self);
3806 4042
3807 $self 4043 $self
3808} 4044}
3809 4045
3810sub size_request { 4046sub size_request {
… …
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4212 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977 4213
3978 $w = 0 if $w < 0; 4214 $w = 0 if $w < 0;
3979 $h = 0 if $h < 0; 4215 $h = 0 if $h < 0;
3980 4216
4217 $w = max $widget->{min_w}, $w;
4218 $h = max $widget->{min_h}, $h;
4219
4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4222
4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4225
3981 $w = int $w + 0.5; 4226 $w = int $w + 0.5;
3982 $h = int $h + 0.5; 4227 $h = int $h + 0.5;
3983 4228
3984 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4229 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985 $widget->{old_w} = $widget->{w}; 4230 $widget->{old_w} = $widget->{w};
… …
3995 4240
3996 while ($self->{post_alloc_hook}) { 4241 while ($self->{post_alloc_hook}) {
3997 $_->() 4242 $_->()
3998 for values %{delete $self->{post_alloc_hook}}; 4243 for values %{delete $self->{post_alloc_hook}};
3999 } 4244 }
4000
4001 4245
4002 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4246 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4003 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4247 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4004 glClear GL_COLOR_BUFFER_BIT; 4248 glClear GL_COLOR_BUFFER_BIT;
4005 4249
… …
4008 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4252 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4009 glMatrixMode GL_MODELVIEW; 4253 glMatrixMode GL_MODELVIEW;
4010 glLoadIdentity; 4254 glLoadIdentity;
4011 4255
4012 { 4256 {
4013 package CFClient::UI::Base; 4257 package CFPlus::UI::Base;
4014 4258
4015 ($draw_x, $draw_y, $draw_w, $draw_h) = 4259 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4016 (0, 0, $self->{w}, $self->{h}); 4260 (0, 0, $self->{w}, $self->{h});
4017 }
4018 4261
4019 $self->_draw; 4262 $self->_draw;
4263 }
4020} 4264}
4021 4265
4022############################################################################# 4266#############################################################################
4023 4267
4024package CFClient::UI; 4268package CFPlus::UI;
4025 4269
4026$ROOT = new CFClient::UI::Root; 4270$ROOT = new CFPlus::UI::Root;
4027$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4271$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4028 4272
40291 42731
4030 4274

Diff Legend

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