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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.391 by root, Sat Jul 21 13:33:10 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
… …
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 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider});
1127 }
1128
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131
1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider}{visible}) {
1134 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider});
1136 }
1137}
1138
995sub update { 1139sub update {
996 my ($self) = @_; 1140 my ($self) = @_;
997 1141
1142 $self->update_slider;
998 $self->SUPER::update; 1143 $self->SUPER::update;
1144}
999 1145
1000 # todo: overwrite size_allocate of child 1146sub invoke_mouse_wheel {
1001 my $child = $self->{vp}->child; 1147 my ($self, $ev) = @_;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1148
1149 $self->{vslider}->emit (mouse_wheel => $ev)
1150 if $ev->{dy};
1151
1152 $self->{hslider}->emit (mouse_wheel => $ev)
1153 if $ev->{dx};
1154
1155 1
1156}
1157
1158sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_;
1160
1161 if ($ev->{button} == 2) {
1162 $self->grab_focus;
1163
1164 my $ox = $self->{vp}{view_x} + $ev->{x};
1165 my $oy = $self->{vp}{view_y} + $ev->{y};
1166
1167 $self->{motion} = sub {
1168 my ($ev, $x, $y) = @_;
1169
1170 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1171 $self->update;
1172 };
1173
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_button_up {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if (delete $self->{motion}) {
1184 return 1;
1185 }
1186
1187 0
1188}
1189
1190sub invoke_mouse_motion {
1191 my ($self, $ev, $x, $y) = @_;
1192
1193 if ($self->{motion}) {
1194 $self->{motion}->($ev, $x, $y);
1195 return 1;
1196 }
1197
1198 0
1003} 1199}
1004 1200
1005sub invoke_size_allocate { 1201sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1202 my ($self, $w, $h) = @_;
1007 1203
1008 my $child = $self->{vp}->child; 1204 $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) 1205 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1206}
1013 1207
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016
1017############################################################################# 1208#############################################################################
1018 1209
1019package CFClient::UI::Frame; 1210package CFPlus::UI::Frame;
1020 1211
1021our @ISA = CFClient::UI::Bin::; 1212our @ISA = CFPlus::UI::Bin::;
1022 1213
1023use CFClient::OpenGL; 1214use CFPlus::OpenGL;
1024 1215
1025sub new { 1216sub new {
1026 my $class = shift; 1217 my $class = shift;
1027 1218
1028 $class->SUPER::new ( 1219 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1245 $self->SUPER::_draw;
1055} 1246}
1056 1247
1057############################################################################# 1248#############################################################################
1058 1249
1059package CFClient::UI::FancyFrame; 1250package CFPlus::UI::FancyFrame;
1060 1251
1061our @ISA = CFClient::UI::Bin::; 1252our @ISA = CFPlus::UI::Bin::;
1062 1253
1063use CFClient::OpenGL; 1254use CFPlus::OpenGL;
1255
1256sub new {
1257 my ($class, %arg) = @_;
1258
1259 if ((exists $arg{label}) && !ref $arg{label}) {
1260 $arg{label} = new CFPlus::UI::Label
1261 align => 1,
1262 valign => 0,
1263 text => $arg{label},
1264 fontsize => ($arg{border} || 0.8) * 0.75;
1265 }
1266
1267 my $self = $class->SUPER::new (
1268 # label => "",
1269 fg => [0.6, 0.3, 0.1],
1270 border => 0.8,
1271 style => 'single',
1272 %arg,
1273 );
1274
1275 $self
1276}
1277
1278sub add {
1279 my ($self, @widgets) = @_;
1280
1281 $self->SUPER::add (@widgets);
1282 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1283}
1284
1285sub border {
1286 int $_[0]{border} * $::FONTSIZE
1287}
1288
1289sub size_request {
1290 my ($self) = @_;
1291
1292 ($self->{label_w}, undef) = $self->{label}->size_request
1293 if $self->{label};
1294
1295 my ($w, $h) = $self->SUPER::size_request;
1296
1297 (
1298 $w + $self->border * 2,
1299 $h + $self->border * 2,
1300 )
1301}
1302
1303sub invoke_size_allocate {
1304 my ($self, $w, $h) = @_;
1305
1306 my $border = $self->border;
1307
1308 $w -= List::Util::max 0, $border * 2;
1309 $h -= List::Util::max 0, $border * 2;
1310
1311 if (my $label = $self->{label}) {
1312 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1313 $label->{h} = List::Util::min $h, $border;
1314 $label->invoke_size_allocate ($label->{w}, $label->{h});
1315 }
1316
1317 $self->child->configure ($border, $border, $w, $h);
1318
1319 1
1320}
1321
1322sub _draw {
1323 my ($self) = @_;
1324
1325 my $child = $self->{children}[0];
1326
1327 my $border = $self->border;
1328 my ($w, $h) = ($self->{w}, $self->{h});
1329
1330 $child->draw;
1331
1332 glColor @{$self->{fg}};
1333 glBegin GL_LINE_STRIP;
1334 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1335 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1336 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1337 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1338 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1339 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1340 glEnd;
1341
1342 if ($self->{label}) {
1343 glTranslate $border * 2, 0;
1344 $self->{label}->_draw;
1345 }
1346}
1347
1348#############################################################################
1349
1350package CFPlus::UI::Toplevel;
1351
1352our @ISA = CFPlus::UI::Bin::;
1353
1354use CFPlus::OpenGL;
1064 1355
1065my $bg = 1356my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1357 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1; 1358 mipmap => 1, wrap => 1;
1068 1359
1069my @border = 1360my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1361 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); 1362 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1363
1364my @icon =
1365 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1366 qw(x1_move.png x1_resize.png);
1072 1367
1073sub new { 1368sub new {
1074 my ($class, %arg) = @_; 1369 my ($class, %arg) = @_;
1075 1370
1076 my $self = $class->SUPER::new ( 1371 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1372 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1373 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1374 border => 0.6,
1080 can_events => 1, 1375 can_events => 1,
1081 min_w => 16, 1376 min_w => 64,
1082 min_h => 16, 1377 min_h => 32,
1083 %arg, 1378 %arg,
1084 ); 1379 );
1085 1380
1086 $self->{title_widget} = new CFClient::UI::Label 1381 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 1382 align => 0,
1088 valign => 1, 1383 valign => 1,
1089 text => $self->{title}, 1384 text => $self->{title},
1090 fontsize => $self->{border}, 1385 fontsize => $self->{border},
1091 if exists $self->{title}; 1386 if exists $self->{title};
1092 1387
1093 if ($self->{has_close_button}) { 1388 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1389 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1390 new CFPlus::UI::ImageButton
1096 image => 'x1_close.png', 1391 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1392 on_activate => sub { $self->emit ("delete") };
1098 1393
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1394 $self->CFPlus::UI::Container::add ($self->{close_button});
1100 } 1395 }
1101 1396
1102 $self 1397 $self
1103} 1398}
1104 1399
1105sub add { 1400sub add {
1106 my ($self, @widgets) = @_; 1401 my ($self, @widgets) = @_;
1107 1402
1108 $self->SUPER::add (@widgets); 1403 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1404 $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}; 1405 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111} 1406}
1112 1407
1113sub border { 1408sub border {
1114 int $_[0]{border} * $::FONTSIZE 1409 int $_[0]{border} * $::FONTSIZE
1115} 1410}
… …
1148 $self->child->configure ($border, $border, $w, $h); 1443 $self->child->configure ($border, $border, $w, $h);
1149 1444
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1445 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1446 if $self->{close_button};
1152 1447
1448 1
1449}
1450
1451sub invoke_delete {
1452 my ($self) = @_;
1453
1454 $self->hide;
1455
1153 1 1456 1
1154} 1457}
1155 1458
1156sub invoke_button_down { 1459sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1460 my ($self, $ev, $x, $y) = @_;
… …
1215 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1518 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216 1519
1217 ! ! $self->{motion} 1520 ! ! $self->{motion}
1218} 1521}
1219 1522
1523sub invoke_visibility_change {
1524 my ($self, $visible) = @_;
1525
1526 delete $self->{motion} unless $visible;
1527
1528 0
1529}
1530
1220sub _draw { 1531sub _draw {
1221 my ($self) = @_; 1532 my ($self) = @_;
1222 1533
1223 my $child = $self->{children}[0]; 1534 my $child = $self->{children}[0];
1224 1535
… …
1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1540 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1230 1541
1231 my $border = $self->border; 1542 my $border = $self->border;
1232 1543
1233 glColor @{ $self->{border_bg} }; 1544 glColor @{ $self->{border_bg} };
1234 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1545 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1235 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1546 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1236 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1547 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1237 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1548 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1549
1550 # move
1551 my $w2 = ($w - $border) * .5;
1552 my $h2 = ($h - $border) * .5;
1553 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1554 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1556
1557 # resize
1558 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1559 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1560 unless $self->{has_close_button};
1561 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1562 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1238 1563
1239 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1564 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1240 glColor @{ $self->{bg} }; 1565 glColor @{ $self->{bg} };
1241 1566
1242 # TODO: repeat texture not scale 1567 # TODO: repeat texture not scale
… …
1261 if $self->{close_button}; 1586 if $self->{close_button};
1262} 1587}
1263 1588
1264############################################################################# 1589#############################################################################
1265 1590
1266package CFClient::UI::Table; 1591package CFPlus::UI::Table;
1267 1592
1268our @ISA = CFClient::UI::Base::; 1593our @ISA = CFPlus::UI::Container::;
1269 1594
1270use List::Util qw(max sum); 1595use List::Util qw(max sum);
1271 1596
1272use CFClient::OpenGL; 1597use CFPlus::OpenGL;
1273 1598
1274sub new { 1599sub new {
1275 my $class = shift; 1600 my $class = shift;
1276 1601
1277 $class->SUPER::new ( 1602 $class->SUPER::new (
1278 col_expand => [], 1603 col_expand => [],
1604 row_expand => [],
1279 @_, 1605 @_,
1280 ) 1606 )
1281} 1607}
1282 1608
1283sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285}
1286
1287sub add { 1609sub add {
1288 my ($self, $x, $y, $child) = @_; 1610 my ($self, @widgets) = @_;
1289 1611
1290 $child->set_parent ($self); 1612 for my $child (@widgets) {
1291 $self->{children}[$y][$x] = $child; 1613 $child->{rowspan} ||= 1;
1614 $child->{colspan} ||= 1;
1615 }
1292 1616
1293 $self->realloc; 1617 $self->SUPER::add (@widgets);
1294} 1618}
1295 1619
1296sub remove { 1620sub add_at {
1621 my $self = shift;
1622
1623 my @widgets;
1624
1625 while (@_) {
1626 my ($col, $row, $child) = splice @_, 0, 3, ();
1627
1628 $child->{row} = $row;
1629 $child->{col} = $col;
1630
1631 push @widgets, $child;
1632 }
1633
1634 $self->add (@widgets);
1635}
1636
1637sub get_wh {
1297 my ($self, $child) = @_; 1638 my ($self) = @_;
1298 1639
1299 # TODO: not yet implemented 1640 my (@w, @h);
1300}
1301
1302# TODO: move to container class maybe? send children a signal on removal?
1303sub clear {
1304 my ($self) = @_;
1305 1641
1306 my @children = $self->children; 1642 my @children = $self->children;
1307 delete $self->{children}; 1643
1644 # first pass, columns
1645 for my $widget (sort { $b->{colspan} <=> $a->{colspan} } @children) {
1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1647
1648 my $sw = sum @w[$c .. $c + $cs - 1];
1649
1650 if ($w > $sw) {
1651 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1652 }
1308 1653 }
1309 for (@children) {
1310 delete $_->{parent};
1311 $_->hide;
1312 }
1313 1654
1314 $self->realloc; 1655 # second pass, rows
1315} 1656 for my $widget (sort { $b->{rowspan} <=> $a->{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)}; 1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1330 1658
1331 $w[$x] = max $w[$x], $w; 1659 my $sh = sum @h[$r .. $r + $rs - 1];
1332 $h[$y] = max $h[$y], $h; 1660
1661 if ($h > $sh) {
1662 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1333 } 1663 }
1334 } 1664 }
1335 1665
1336 (\@w, \@h) 1666 (\@w, \@h)
1337} 1667}
… …
1353 my ($ws, $hs) = $self->get_wh; 1683 my ($ws, $hs) = $self->get_wh;
1354 1684
1355 my $req_w = (sum @$ws) || 1; 1685 my $req_w = (sum @$ws) || 1;
1356 my $req_h = (sum @$hs) || 1; 1686 my $req_h = (sum @$hs) || 1;
1357 1687
1358 # TODO: nicer code && do row_expand 1688 # now linearly scale the rows/columns to the allocated size
1359 my @col_expand = @{$self->{col_expand}}; 1689 my @col_expand = @{$self->{col_expand}};
1360 @col_expand = (1) x @$ws unless @col_expand; 1690 @col_expand = (1) x @$ws unless @col_expand;
1361 my $col_expand = (sum @col_expand) || 1; 1691 my $col_expand = (sum @col_expand) || 1;
1362 1692
1363 # linearly scale sizes
1364 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1693 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366 1694
1367 CFClient::UI::harmonize $ws; 1695 CFPlus::UI::harmonize $ws;
1696
1697 my @row_expand = @{$self->{row_expand}};
1698 @row_expand = (1) x @$ws unless @row_expand;
1699 my $row_expand = (sum @row_expand) || 1;
1700
1701 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1702
1368 CFClient::UI::harmonize $hs; 1703 CFPlus::UI::harmonize $hs;
1369 1704
1370 my $y; 1705 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1706 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1371 1707
1372 for my $r (0 .. $#{$self->{children}}) { 1708 for my $widget ($self->children) {
1373 my $row = $self->{children}[$r] 1709 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1374 or next;
1375 1710
1376 my $x = 0; 1711 $widget->configure (
1377 my $row_h = $hs->[$r]; 1712 $x[$c], $y[$r],
1713 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1378 1714 );
1379 for my $c (0 .. $#$row) { 1715 }
1380 my $col_w = $ws->[$c];
1381 1716
1382 if (my $widget = $row->[$c]) { 1717 1
1383 $widget->configure ($x, $y, $col_w, $row_h); 1718}
1384 }
1385 1719
1386 $x += $col_w; 1720#############################################################################
1721
1722package CFPlus::UI::Fixed;
1723
1724use List::Util qw(min max);
1725
1726our @ISA = CFPlus::UI::Container::;
1727
1728sub add {
1729 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1730
1731 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1732 $self->SUPER::add ($child);
1733}
1734
1735sub _scale($$$) {
1736 my ($mode, $val, $max) = @_;
1737
1738 $mode eq "abs" ? $val
1739 : $mode eq "rel" ? $val * $max
1740 : 0
1741}
1742
1743sub size_request {
1744 my ($self) = @_;
1745
1746 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1747
1748 # determine overall size by querying abs widgets
1749 for my $child ($self->visible_children) {
1750 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1751
1752 if ($pos eq "abs") {
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1757 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1387 } 1758 }
1759 }
1388 1760
1389 $y += $row_h; 1761 my $W = $x2 - $x1;
1762 my $H = $y2 - $y1;
1763
1764 # now layout remaining widgets
1765 for my $child ($self->visible_children) {
1766 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1767
1768 if ($pos ne "abs") {
1769 $x = _scale $pos, $x, $W;
1770 $y = _scale $pos, $x, $H;
1771 $w = _scale $size, $w, $child->{req_w};
1772 $h = _scale $size, $h, $child->{req_h};
1773
1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1776 }
1777 }
1778
1779 my $W = $x2 - $x1;
1780 my $H = $y2 - $y1;
1781
1782 ($W, $H)
1783}
1784
1785sub invoke_size_allocate {
1786 my ($self, $W, $H) = @_;
1787
1788 for my $child ($self->visible_children) {
1789 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1790
1791 $x = _scale $pos, $x, $W;
1792 $y = _scale $pos, $x, $H;
1793 $w = _scale $size, $w, $child->{req_w};
1794 $h = _scale $size, $h, $child->{req_h};
1795
1796 $child->configure ($x, $y, $w, $h);
1390 } 1797 }
1391 1798
1392 1 1799 1
1393} 1800}
1394 1801
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############################################################################# 1802#############################################################################
1420 1803
1421package CFClient::UI::Box; 1804package CFPlus::UI::Box;
1422 1805
1423our @ISA = CFClient::UI::Container::; 1806our @ISA = CFPlus::UI::Container::;
1424 1807
1425sub size_request { 1808sub size_request {
1426 my ($self) = @_; 1809 my ($self) = @_;
1427 1810
1428 $self->{vertical} 1811 $self->{vertical}
… …
1438 1821
1439sub invoke_size_allocate { 1822sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_; 1823 my ($self, $w, $h) = @_;
1441 1824
1442 my $space = $self->{vertical} ? $h : $w; 1825 my $space = $self->{vertical} ? $h : $w;
1443 my $children = $self->{children}; 1826 my @children = $self->visible_children;
1444 1827
1445 my @req; 1828 my @req;
1446 1829
1447 if ($self->{homogeneous}) { 1830 if ($self->{homogeneous}) {
1448 @req = ($space / (@$children || 1)) x @$children; 1831 @req = ($space / (@children || 1)) x @children;
1449 } else { 1832 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1833 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451 my $req = List::Util::sum @req; 1834 my $req = List::Util::sum @req;
1452 1835
1453 if ($req > $space) { 1836 if ($req > $space) {
1454 # ah well, not enough space 1837 # ah well, not enough space
1455 $_ *= $space / $req for @req; 1838 $_ *= $space / $req for @req;
1456 } else { 1839 } else {
1457 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1840 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458 1841
1459 $space = ($space - $req) / $expand; # remaining space to give away 1842 $space = ($space - $req) / $expand; # remaining space to give away
1460 1843
1461 $req[$_] += $space * $children->[$_]{expand} 1844 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#$children; 1845 for 0 .. $#children;
1463 } 1846 }
1464 } 1847 }
1465 1848
1466 CFClient::UI::harmonize \@req; 1849 CFPlus::UI::harmonize \@req;
1467 1850
1468 my $pos = 0; 1851 my $pos = 0;
1469 for (0 .. $#$children) { 1852 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1853 my $alloc = $req[$_];
1471 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1854 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472 1855
1473 $pos += $alloc; 1856 $pos += $alloc;
1474 } 1857 }
1475 1858
1476 1 1859 1
1477} 1860}
1478 1861
1479############################################################################# 1862#############################################################################
1480 1863
1481package CFClient::UI::HBox; 1864package CFPlus::UI::HBox;
1482 1865
1483our @ISA = CFClient::UI::Box::; 1866our @ISA = CFPlus::UI::Box::;
1484 1867
1485sub new { 1868sub new {
1486 my $class = shift; 1869 my $class = shift;
1487 1870
1488 $class->SUPER::new ( 1871 $class->SUPER::new (
… …
1491 ) 1874 )
1492} 1875}
1493 1876
1494############################################################################# 1877#############################################################################
1495 1878
1496package CFClient::UI::VBox; 1879package CFPlus::UI::VBox;
1497 1880
1498our @ISA = CFClient::UI::Box::; 1881our @ISA = CFPlus::UI::Box::;
1499 1882
1500sub new { 1883sub new {
1501 my $class = shift; 1884 my $class = shift;
1502 1885
1503 $class->SUPER::new ( 1886 $class->SUPER::new (
… …
1506 ) 1889 )
1507} 1890}
1508 1891
1509############################################################################# 1892#############################################################################
1510 1893
1511package CFClient::UI::Label; 1894package CFPlus::UI::Label;
1512 1895
1513our @ISA = CFClient::UI::DrawBG::; 1896our @ISA = CFPlus::UI::DrawBG::;
1514 1897
1515use CFClient::OpenGL; 1898use CFPlus::OpenGL;
1516 1899
1517sub new { 1900sub new {
1518 my ($class, %arg) = @_; 1901 my ($class, %arg) = @_;
1519 1902
1520 my $self = $class->SUPER::new ( 1903 my $self = $class->SUPER::new (
… …
1523 #active_bg => none 1906 #active_bg => none
1524 #font => default_font 1907 #font => default_font
1525 #text => initial text 1908 #text => initial text
1526 #markup => initial narkup 1909 #markup => initial narkup
1527 #max_w => maximum pixel width 1910 #max_w => maximum pixel width
1911 #style => 0, # render flags
1528 ellipsise => 3, # end 1912 ellipsise => 3, # end
1529 layout => (new CFClient::Layout), 1913 layout => (new CFPlus::Layout),
1530 fontsize => 1, 1914 fontsize => 1,
1531 align => -1, 1915 align => -1,
1532 valign => -1, 1916 valign => -1,
1533 padding_x => 2, 1917 padding_x => 2,
1534 padding_y => 2, 1918 padding_y => 2,
1535 can_events => 0, 1919 can_events => 0,
1536 %arg 1920 %arg
1537 ); 1921 );
1538 1922
1539 if (exists $self->{template}) { 1923 if (exists $self->{template}) {
1540 my $layout = new CFClient::Layout; 1924 my $layout = new CFPlus::Layout;
1541 $layout->set_text (delete $self->{template}); 1925 $layout->set_text (delete $self->{template});
1542 $self->{template} = $layout; 1926 $self->{template} = $layout;
1543 } 1927 }
1544 1928
1545 if (exists $self->{markup}) { 1929 if (exists $self->{markup}) {
… …
1549 } 1933 }
1550 1934
1551 $self 1935 $self
1552} 1936}
1553 1937
1554sub escape($) {
1555 local $_ = $_[0];
1556
1557 s/&/&amp;/g;
1558 s/>/&gt;/g;
1559 s/</&lt;/g;
1560
1561 $_
1562}
1563
1564sub update { 1938sub update {
1565 my ($self) = @_; 1939 my ($self) = @_;
1566 1940
1567 delete $self->{texture}; 1941 delete $self->{texture};
1568 $self->SUPER::update; 1942 $self->SUPER::update;
… …
1579 my ($self, $text) = @_; 1953 my ($self, $text) = @_;
1580 1954
1581 return if $self->{text} eq "T$text"; 1955 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1956 $self->{text} = "T$text";
1583 1957
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1958 $self->{layout}->set_text ($text);
1586 1959
1587 delete $self->{size_req}; 1960 delete $self->{size_req};
1588 $self->realloc; 1961 $self->realloc;
1589 $self->update; 1962 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1968 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1969 $self->{text} = "M$markup";
1597 1970
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1971 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1972
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1973 $self->{layout}->set_markup ($markup);
1602 1974
1603 delete $self->{size_req}; 1975 delete $self->{size_req};
1604 $self->realloc; 1976 $self->realloc;
1605 $self->update; 1977 $self->update;
… …
1617 1989
1618 my ($w, $h) = $self->{layout}->size; 1990 my ($w, $h) = $self->{layout}->size;
1619 1991
1620 if (exists $self->{template}) { 1992 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1993 $self->{template}->set_font ($self->{font}) if $self->{font};
1994 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1995 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1996
1624 my ($w2, $h2) = $self->{template}->size; 1997 my ($w2, $h2) = $self->{template}->size;
1625 1998
1626 $w = List::Util::max $w, $w2; 1999 $w = List::Util::max $w, $w2;
… …
1631 }; 2004 };
1632 2005
1633 @{ $self->{size_req} } 2006 @{ $self->{size_req} }
1634} 2007}
1635 2008
2009sub baseline_shift {
2010 $_[0]{layout}->descent
2011}
2012
1636sub invoke_size_allocate { 2013sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 2014 my ($self, $w, $h) = @_;
1638 2015
1639 delete $self->{ox}; 2016 delete $self->{ox};
1640 2017
… …
1646 2023
1647sub set_fontsize { 2024sub set_fontsize {
1648 my ($self, $fontsize) = @_; 2025 my ($self, $fontsize) = @_;
1649 2026
1650 $self->{fontsize} = $fontsize; 2027 $self->{fontsize} = $fontsize;
2028 delete $self->{size_req};
1651 delete $self->{texture}; 2029 delete $self->{texture};
1652 2030
1653 $self->realloc; 2031 $self->realloc;
1654} 2032}
1655 2033
1656sub reconfigure { 2034sub reconfigure {
1657 my ($self) = @_; 2035 my ($self) = @_;
1658 2036
1659 delete $self->{size_req}; 2037 delete $self->{size_req};
2038 delete $self->{texture};
1660 2039
1661 $self->SUPER::reconfigure; 2040 $self->SUPER::reconfigure;
1662} 2041}
1663 2042
1664sub _draw { 2043sub _draw {
1665 my ($self) = @_; 2044 my ($self) = @_;
1666 2045
1667 $self->SUPER::_draw; # draw background, if applicable 2046 $self->SUPER::_draw; # draw background, if applicable
1668 2047
1669 my $tex = $self->{texture} ||= do { 2048 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 2049 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2050 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 2051 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2052 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2053 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2054 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 2055
1677 new_from_layout CFClient::Texture $self->{layout} 2056 [$self->{layout}->size]
1678 }; 2057 };
1679 2058
1680 unless (exists $self->{ox}) { 2059 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2060 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2061 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 2062 : ($self->{w} - $size->[0]) * 0.5);
1684 2063
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2064 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2065 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 2066 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 2067 };
1689 2068
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2069 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2070 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 2071
1695 if ($tex->{format} == GL_ALPHA) { 2072 $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} 2073}
1706 2074
1707############################################################################# 2075#############################################################################
1708 2076
1709package CFClient::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
1710 2078
1711our @ISA = CFClient::UI::Label::; 2079our @ISA = CFPlus::UI::Label::;
1712 2080
1713use CFClient::OpenGL; 2081use CFPlus::OpenGL;
1714 2082
1715sub new { 2083sub new {
1716 my $class = shift; 2084 my $class = shift;
1717 2085
1718 $class->SUPER::new ( 2086 $class->SUPER::new (
… …
1722 active_fg => [0, 0, 0], 2090 active_fg => [0, 0, 0],
1723 can_hover => 1, 2091 can_hover => 1,
1724 can_focus => 1, 2092 can_focus => 1,
1725 valign => 0, 2093 valign => 0,
1726 can_events => 1, 2094 can_events => 1,
2095 ellipsise => 0,
1727 #text => ... 2096 #text => ...
1728 #hidden => "*", 2097 #hidden => "*",
1729 @_ 2098 @_
1730 ) 2099 )
1731} 2100}
… …
1776 my $sym = $ev->{sym}; 2145 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 2146 my $uni = $ev->{unicode};
1778 2147
1779 my $text = $self->get_text; 2148 my $text = $self->get_text;
1780 2149
2150 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2151
1781 if ($uni == 8) { 2152 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2153 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 2154 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 2155 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 2156 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 2157 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 2158 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2159 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 2160 } elsif ($sym == CFPlus::SDLK_HOME) {
2161 # what a hack
2162 $self->{cursor} =
2163 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2164 ? length $1
2165 : 0;
2166 } elsif ($sym == CFPlus::SDLK_END) {
2167 # uh, again
2168 $self->{cursor} =
2169 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2170 ? $self->{cursor} + length $1
2171 : length $self->{text};
2172 } elsif ($uni == 21) { # ctrl-u
2173 $text = "";
1790 $self->{cursor} = 0; 2174 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 2175 } elsif ($uni == 27) {
1794 $self->emit ('escape'); 2176 $self->emit ('escape');
1795 } elsif ($uni) { 2177 } elsif ($uni == 0x0d) {
2178 substr $text, $self->{cursor}++, 0, "\012";
2179 } elsif ($uni >= 0x20) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 2180 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 2181 } else {
1798 return 0; 2182 return 0;
1799 } 2183 }
1800 2184
1801 $self->_set_text ($text); 2185 $self->_set_text ($text);
1802 2186
1803 $self->realloc; 2187 $self->realloc;
2188 $self->update;
1804 2189
1805 1 2190 1
1806} 2191}
1807 2192
1808sub invoke_focus_in { 2193sub invoke_focus_in {
… …
1820 2205
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2206 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2207
1823 # byte-index to char-index 2208 # byte-index to char-index
1824 my $text = $self->{text}; 2209 my $text = $self->{text};
1825 utf8::encode $text; 2210 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2211 $self->{cursor} = length $text;
1827 2212
1828 $self->_set_text ($self->{text}); 2213 $self->_set_text ($self->{text});
1829 $self->update; 2214 $self->update;
1830 2215
1831 1 2216 1
… …
1870 utf8::encode $text; 2255 utf8::encode $text;
1871 2256
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873 } 2258 }
1874 2259
1875 glColor @{$self->{fg}};
1876 glBegin GL_LINES; 2260 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2261 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}; 2262 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 2263 glEnd;
1880 } 2264 }
1881} 2265}
1882 2266
2267#############################################################################
2268
1883package CFClient::UI::Entry; 2269package CFPlus::UI::Entry;
1884 2270
1885our @ISA = CFClient::UI::EntryBase::; 2271our @ISA = CFPlus::UI::EntryBase::;
1886 2272
1887use CFClient::OpenGL; 2273use CFPlus::OpenGL;
1888 2274
1889sub invoke_key_down { 2275sub invoke_key_down {
1890 my ($self, $ev) = @_; 2276 my ($self, $ev) = @_;
1891 2277
1892 my $sym = $ev->{sym}; 2278 my $sym = $ev->{sym};
1893 2279
1894 if ($sym == 13) { 2280 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2281 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2282 my $txt = $self->get_text;
1897 2283
1898 $self->{history_pointer} = -1; 2284 $self->{history_pointer} = -1;
1899 $self->{history_saveback} = ''; 2285 $self->{history_saveback} = '';
1900 $self->emit (activate => $txt); 2286 $self->emit (activate => $txt);
1901 $self->update; 2287 $self->update;
1902 2288
1903 } elsif ($sym == CFClient::SDLK_UP) { 2289 } elsif ($sym == CFPlus::SDLK_UP) {
1904 if ($self->{history_pointer} < 0) { 2290 if ($self->{history_pointer} < 0) {
1905 $self->{history_saveback} = $self->get_text; 2291 $self->{history_saveback} = $self->get_text;
1906 } 2292 }
1907 if (@{$self->{history} || []} > 0) { 2293 if (@{$self->{history} || []} > 0) {
1908 $self->{history_pointer}++; 2294 $self->{history_pointer}++;
… …
1910 $self->{history_pointer} = @{$self->{history} || []} - 1; 2296 $self->{history_pointer} = @{$self->{history} || []} - 1;
1911 } 2297 }
1912 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2298 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1913 } 2299 }
1914 2300
1915 } elsif ($sym == CFClient::SDLK_DOWN) { 2301 } elsif ($sym == CFPlus::SDLK_DOWN) {
1916 $self->{history_pointer}--; 2302 $self->{history_pointer}--;
1917 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2303 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918 2304
1919 if ($self->{history_pointer} >= 0) { 2305 if ($self->{history_pointer} >= 0) {
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2306 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1929 1 2315 1
1930} 2316}
1931 2317
1932############################################################################# 2318#############################################################################
1933 2319
2320package CFPlus::UI::TextEdit;
2321
2322our @ISA = CFPlus::UI::EntryBase::;
2323
2324use CFPlus::OpenGL;
2325
2326sub move_cursor_ver {
2327 my ($self, $dy) = @_;
2328
2329 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2330
2331 $y += $dy;
2332
2333 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2334 $self->{cursor} = $index;
2335 delete $self->{cur_h};
2336 $self->update;
2337 return;
2338 }
2339}
2340
2341sub invoke_key_down {
2342 my ($self, $ev) = @_;
2343
2344 my $sym = $ev->{sym};
2345
2346 if ($sym == CFPlus::SDLK_UP) {
2347 $self->move_cursor_ver (-1);
2348 } elsif ($sym == CFPlus::SDLK_DOWN) {
2349 $self->move_cursor_ver (+1);
2350 } else {
2351 return $self->SUPER::invoke_key_down ($ev)
2352 }
2353
2354 1
2355}
2356
2357#############################################################################
2358
1934package CFClient::UI::Button; 2359package CFPlus::UI::Button;
1935 2360
1936our @ISA = CFClient::UI::Label::; 2361our @ISA = CFPlus::UI::Label::;
1937 2362
1938use CFClient::OpenGL; 2363use CFPlus::OpenGL;
1939 2364
1940my @tex = 2365my @tex =
1941 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2366 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942 qw(b1_button_active.png); 2367 qw(b1_button_inactive.png b1_button_active.png);
1943 2368
1944sub new { 2369sub new {
1945 my $class = shift; 2370 my $class = shift;
1946 2371
1947 $class->SUPER::new ( 2372 $class->SUPER::new (
1948 padding_x => 4, 2373 padding_x => 4,
1949 padding_y => 4, 2374 padding_y => 4,
1950 fg => [1, 1, 1], 2375 fg => [1.0, 1.0, 1.0],
1951 active_fg => [0, 0, 1], 2376 active_fg => [0.8, 0.8, 0.8],
1952 can_hover => 1, 2377 can_hover => 1,
1953 align => 0, 2378 align => 0,
1954 valign => 0, 2379 valign => 0,
1955 can_events => 1, 2380 can_events => 1,
1956 @_ 2381 @_
… …
1974 2399
1975 glEnable GL_TEXTURE_2D; 2400 glEnable GL_TEXTURE_2D;
1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1977 glColor 0, 0, 0, 1; 2402 glColor 0, 0, 0, 1;
1978 2403
2404 my $tex = $tex[$GRAB == $self];
1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2405 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1980 2406
1981 glDisable GL_TEXTURE_2D; 2407 glDisable GL_TEXTURE_2D;
1982 2408
1983 $self->SUPER::_draw; 2409 $self->SUPER::_draw;
1984} 2410}
1985 2411
1986############################################################################# 2412#############################################################################
1987 2413
2414package CFPlus::UI::CheckBox;
2415
2416our @ISA = CFPlus::UI::DrawBG::;
2417
2418my @tex =
2419 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2420 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2421
2422use CFPlus::OpenGL;
2423
2424sub new {
2425 my $class = shift;
2426
2427 $class->SUPER::new (
2428 padding_x => 2,
2429 padding_y => 2,
2430 fg => [1, 1, 1],
2431 active_fg => [1, 1, 0],
2432 bg => [0, 0, 0, 0.2],
2433 active_bg => [1, 1, 1, 0.5],
2434 state => 0,
2435 can_hover => 1,
2436 @_
2437 )
2438}
2439
2440sub size_request {
2441 my ($self) = @_;
2442
2443 (6) x 2
2444}
2445
2446sub toggle {
2447 my ($self) = @_;
2448
2449 $self->{state} = !$self->{state};
2450 $self->emit (changed => $self->{state});
2451 $self->update;
2452}
2453
2454sub invoke_button_down {
2455 my ($self, $ev, $x, $y) = @_;
2456
2457 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2458 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2459 $self->toggle;
2460 } else {
2461 return 0
2462 }
2463
2464 1
2465}
2466
2467sub _draw {
2468 my ($self) = @_;
2469
2470 $self->SUPER::_draw;
2471
2472 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2473
2474 my ($w, $h) = @$self{qw(w h)};
2475
2476 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2477
2478 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2479
2480 my $tex = $self->{state} ? $tex[1] : $tex[0];
2481
2482 glEnable GL_TEXTURE_2D;
2483 $tex->draw_quad_alpha (0, 0, $s, $s);
2484 glDisable GL_TEXTURE_2D;
2485}
2486
2487#############################################################################
2488
2489package CFPlus::UI::Image;
2490
2491our @ISA = CFPlus::UI::Base::;
2492
2493use CFPlus::OpenGL;
2494
2495our %texture_cache;
2496
2497sub new {
2498 my $class = shift;
2499
2500 my $self = $class->SUPER::new (
2501 can_events => 0,
2502 @_,
2503 );
2504
2505 $self->{path} || $self->{tex}
2506 or Carp::croak "'path' or 'tex' attributes required";
2507
2508 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2509 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2510
2511 CFPlus::weaken $texture_cache{$self->{path}};
2512
2513 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2514
2515 $self
2516}
2517
2518sub STORABLE_freeze {
2519 my ($self, $cloning) = @_;
2520
2521 $self->{path}
2522 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2523
2524 $self->{path}
2525}
2526
2527sub STORABLE_attach {
2528 my ($self, $cloning, $path) = @_;
2529
2530 $self->new (path => $path)
2531}
2532
2533sub size_request {
2534 my ($self) = @_;
2535
2536 ($self->{tex}{w}, $self->{tex}{h})
2537}
2538
2539sub _draw {
2540 my ($self) = @_;
2541
2542 my $tex = $self->{tex};
2543
2544 my ($w, $h) = ($self->{w}, $self->{h});
2545
2546 if ($self->{rot90}) {
2547 glRotate 90, 0, 0, 1;
2548 glTranslate 0, -$self->{w}, 0;
2549
2550 ($w, $h) = ($h, $w);
2551 }
2552
2553 glEnable GL_TEXTURE_2D;
2554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2555
2556 $tex->draw_quad (0, 0, $w, $h);
2557
2558 glDisable GL_TEXTURE_2D;
2559}
2560
2561#############################################################################
2562
1988package CFClient::UI::ImageButton; 2563package CFPlus::UI::ImageButton;
1989 2564
1990our @ISA = CFClient::UI::Image::; 2565our @ISA = CFPlus::UI::Image::;
1991 2566
1992use CFClient::OpenGL; 2567use CFPlus::OpenGL;
1993 2568
1994my %textures; 2569my %textures;
1995 2570
1996sub new { 2571sub new {
1997 my $class = shift; 2572 my $class = shift;
… …
2019 1 2594 1
2020} 2595}
2021 2596
2022############################################################################# 2597#############################################################################
2023 2598
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; 2599package CFPlus::UI::VGauge;
2093 2600
2094our @ISA = CFClient::UI::Base::; 2601our @ISA = CFPlus::UI::Base::;
2095
2096use CFClient::OpenGL;
2097use Carp qw/confess/;
2098
2099our %loaded_images;
2100
2101sub new {
2102 my $class = shift;
2103
2104 my $self = $class->SUPER::new (can_events => 0, @_);
2105
2106 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2107
2108 $loaded_images{$self->{image}} ||=
2109 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2110
2111 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2112
2113 Scalar::Util::weaken $loaded_images{$self->{image}};
2114
2115 $self->{aspect} = $tex->{w} / $tex->{h};
2116
2117 $self
2118}
2119
2120sub size_request {
2121 my ($self) = @_;
2122
2123 ($self->{tex}->{w}, $self->{tex}->{h})
2124}
2125
2126sub _draw {
2127 my ($self) = @_;
2128
2129 my $tex = $self->{tex};
2130
2131 my ($w, $h) = ($self->{w}, $self->{h});
2132
2133 if ($self->{rot90}) {
2134 glRotate 90, 0, 0, 1;
2135 glTranslate 0, -$self->{w}, 0;
2136
2137 ($w, $h) = ($h, $w);
2138 }
2139
2140 glEnable GL_TEXTURE_2D;
2141 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2142
2143 $tex->draw_quad_alpha (0, 0, $w, $h);
2144
2145 glDisable GL_TEXTURE_2D;
2146}
2147
2148#############################################################################
2149
2150package CFClient::UI::VGauge;
2151
2152our @ISA = CFClient::UI::Base::;
2153 2602
2154use List::Util qw(min max); 2603use List::Util qw(min max);
2155 2604
2156use CFClient::OpenGL; 2605use CFPlus::OpenGL;
2157 2606
2158my %tex = ( 2607my %tex = (
2159 food => [ 2608 food => [
2160 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2609 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2161 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2162 ], 2611 ],
2163 grace => [ 2612 grace => [
2164 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2613 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2614 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2166 ], 2615 ],
2167 hp => [ 2616 hp => [
2168 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2617 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2169 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2170 ], 2619 ],
2171 mana => [ 2620 mana => [
2172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2173 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2622 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2174 ], 2623 ],
2175); 2624);
2176 2625
2177# eg. VGauge->new (gauge => 'food'), default gauge: food 2626# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2237 my $ycut1 = max 0, min 1, $ycut; 2686 my $ycut1 = max 0, min 1, $ycut;
2238 my $ycut2 = max 0, min 1, $ycut - 1; 2687 my $ycut2 = max 0, min 1, $ycut - 1;
2239 2688
2240 my $h1 = $self->{h} * (1 - $ycut1); 2689 my $h1 = $self->{h} * (1 - $ycut1);
2241 my $h2 = $self->{h} * (1 - $ycut2); 2690 my $h2 = $self->{h} * (1 - $ycut2);
2691 my $h3 = $self->{h};
2692
2693 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242 2694
2243 glEnable GL_BLEND; 2695 glEnable GL_BLEND;
2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2696 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2697 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246 glEnable GL_TEXTURE_2D; 2698 glEnable GL_TEXTURE_2D;
… …
2265 2717
2266 if ($t3) { 2718 if ($t3) {
2267 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2719 glBindTexture GL_TEXTURE_2D, $t3->{name};
2268 glBegin GL_QUADS; 2720 glBegin GL_QUADS;
2269 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2721 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2722 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2723 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2724 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273 glEnd; 2725 glEnd;
2274 } 2726 }
2275 2727
2276 glDisable GL_BLEND; 2728 glDisable GL_BLEND;
2277 glDisable GL_TEXTURE_2D; 2729 glDisable GL_TEXTURE_2D;
2278} 2730}
2279 2731
2280############################################################################# 2732#############################################################################
2281 2733
2282package CFClient::UI::Gauge; 2734package CFPlus::UI::Gauge;
2283 2735
2284our @ISA = CFClient::UI::VBox::; 2736our @ISA = CFPlus::UI::VBox::;
2285 2737
2286sub new { 2738sub new {
2287 my ($class, %arg) = @_; 2739 my ($class, %arg) = @_;
2288 2740
2289 my $self = $class->SUPER::new ( 2741 my $self = $class->SUPER::new (
… …
2291 can_hover => 1, 2743 can_hover => 1,
2292 can_events => 1, 2744 can_events => 1,
2293 %arg, 2745 %arg,
2294 ); 2746 );
2295 2747
2296 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2748 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2297 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2749 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2298 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2750 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2299 2751
2300 $self 2752 $self
2301} 2753}
2302 2754
2303sub set_fontsize { 2755sub set_fontsize {
… …
2324 $self->{value}->set_text ($val); 2776 $self->{value}->set_text ($val);
2325} 2777}
2326 2778
2327############################################################################# 2779#############################################################################
2328 2780
2329package CFClient::UI::Slider; 2781package CFPlus::UI::Slider;
2330 2782
2331use strict; 2783use strict;
2332 2784
2333use CFClient::OpenGL; 2785use CFPlus::OpenGL;
2334 2786
2335our @ISA = CFClient::UI::DrawBG::; 2787our @ISA = CFPlus::UI::DrawBG::;
2336 2788
2337my @tex = 2789my @tex =
2338 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2790 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2339 qw(s1_slider.png s1_slider_bg.png); 2791 qw(s1_slider.png s1_slider_bg.png);
2340 2792
2341sub new { 2793sub new {
2342 my $class = shift; 2794 my $class = shift;
2343 2795
… …
2432 } 2884 }
2433 2885
2434 1 2886 1
2435} 2887}
2436 2888
2889sub invoke_mouse_wheel {
2890 my ($self, $ev) = @_;
2891
2892 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2893
2894 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2895
2896 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2897
2898 ! ! $delta
2899}
2900
2437sub update { 2901sub update {
2438 my ($self) = @_; 2902 my ($self) = @_;
2439 2903
2440 delete $self->{knob_w}; 2904 delete $self->{knob_w};
2441 $self->SUPER::update; 2905 $self->SUPER::update;
… …
2488 glDisable GL_TEXTURE_2D; 2952 glDisable GL_TEXTURE_2D;
2489} 2953}
2490 2954
2491############################################################################# 2955#############################################################################
2492 2956
2493package CFClient::UI::ValSlider; 2957package CFPlus::UI::ValSlider;
2494 2958
2495our @ISA = CFClient::UI::HBox::; 2959our @ISA = CFPlus::UI::HBox::;
2496 2960
2497sub new { 2961sub new {
2498 my ($class, %arg) = @_; 2962 my ($class, %arg) = @_;
2499 2963
2500 my $range = delete $arg{range}; 2964 my $range = delete $arg{range};
2501 2965
2502 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2503 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2967 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2504 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2968 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2505 to_value => sub { shift }, 2969 to_value => sub { shift },
2506 from_value => sub { shift }, 2970 from_value => sub { shift },
2507 %arg, 2971 %arg,
2508 ); 2972 );
2509 2973
… …
2529sub set_range { shift->{slider}->set_range (@_) } 2993sub set_range { shift->{slider}->set_range (@_) }
2530sub set_value { shift->{slider}->set_value (@_) } 2994sub set_value { shift->{slider}->set_value (@_) }
2531 2995
2532############################################################################# 2996#############################################################################
2533 2997
2534package CFClient::UI::TextScroller; 2998package CFPlus::UI::TextScroller;
2535 2999
2536our @ISA = CFClient::UI::HBox::; 3000our @ISA = CFPlus::UI::HBox::;
2537 3001
2538use CFClient::OpenGL; 3002use CFPlus::OpenGL;
2539 3003
2540sub new { 3004sub new {
2541 my $class = shift; 3005 my $class = shift;
2542 3006
2543 my $self = $class->SUPER::new ( 3007 my $self = $class->SUPER::new (
2544 fontsize => 1, 3008 fontsize => 1,
2545 can_events => 0, 3009 can_events => 1,
2546 indent => 0, 3010 indent => 0,
2547 #font => default_font 3011 #font => default_font
2548 @_, 3012 @_,
2549 3013
2550 layout => (new CFClient::Layout 1), 3014 layout => (new CFPlus::Layout),
2551 par => [], 3015 par => [],
3016 max_par => 0,
2552 height => 0, 3017 height => 0,
2553 children => [ 3018 children => [
2554 (new CFClient::UI::Empty expand => 1), 3019 (new CFPlus::UI::Empty expand => 1),
2555 (new CFClient::UI::Slider vertical => 1), 3020 (new CFPlus::UI::Slider vertical => 1),
2556 ], 3021 ],
2557 ); 3022 );
2558 3023
2559 $self->{children}[1]->connect (changed => sub { $self->update }); 3024 $self->{children}[1]->connect (changed => sub { $self->update });
2560 3025
… …
2566 3031
2567 $self->{fontsize} = $fontsize; 3032 $self->{fontsize} = $fontsize;
2568 $self->reflow; 3033 $self->reflow;
2569} 3034}
2570 3035
3036sub size_request {
3037 my ($self) = @_;
3038
3039 my ($empty, $slider) = @{ $self->{children} };
3040
3041 local $self->{children} = [$empty, $slider];
3042 $self->SUPER::size_request
3043}
3044
2571sub invoke_size_allocate { 3045sub invoke_size_allocate {
2572 my ($self, $w, $h) = @_; 3046 my ($self, $w, $h) = @_;
2573 3047
3048 my ($empty, $slider, @other) = @{ $self->{children} };
3049 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3050
2574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3051 $self->{layout}->set_font ($self->{font}) if $self->{font};
2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3052 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576 $self->{layout}->set_width ($self->{children}[0]{w}); 3053 $self->{layout}->set_width ($empty->{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3054 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 3055
2579 $self->reflow; 3056 $self->reflow;
2580 3057
3058 local $self->{children} = [$empty, $slider];
2581 $self->SUPER::invoke_size_allocate ($w, $h) 3059 $self->SUPER::invoke_size_allocate ($w, $h)
2582} 3060}
2583 3061
2584sub text_size { 3062sub invoke_mouse_wheel {
2585 my ($self, $text, $indent) = @_; 3063 my ($self, $ev) = @_;
3064
3065 return 0 unless $ev->{dy}; # only vertical movements
3066
3067 $self->{children}[1]->emit (mouse_wheel => $ev);
3068
3069 1
3070}
3071
3072sub get_layout {
3073 my ($self, $para) = @_;
2586 3074
2587 my $layout = $self->{layout}; 3075 my $layout = $self->{layout};
2588 3076
3077 $layout->set_font ($self->{font}) if $self->{font};
3078 $layout->set_foreground (@{$para->{fg}});
2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3079 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590 $layout->set_width ($self->{children}[0]{w} - $indent); 3080 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3081 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($text); 3082 $layout->set_markup ($para->{markup});
3083
3084 $layout->set_shapes (
3085 map
3086 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3087 @{$para->{widget}}
2593 3088 );
3089
2594 $layout->size 3090 $layout
2595} 3091}
2596 3092
2597sub reflow { 3093sub reflow {
2598 my ($self) = @_; 3094 my ($self) = @_;
2599 3095
… …
2606 3102
2607 # todo: base offset on lines or so, not on pixels 3103 # todo: base offset on lines or so, not on pixels
2608 $self->{children}[1]->set_value ($offset); 3104 $self->{children}[1]->set_value ($offset);
2609} 3105}
2610 3106
3107sub current_paragraph {
3108 my ($self) = @_;
3109
3110 $self->{top_paragraph} - 1
3111}
3112
3113sub scroll_to {
3114 my ($self, $para) = @_;
3115
3116 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3117
3118 $self->{scroll_to} = $para;
3119 $self->update;
3120}
3121
2611sub clear { 3122sub clear {
2612 my ($self) = @_; 3123 my ($self) = @_;
3124
3125 my (undef, undef, @other) = @{ $self->{children} };
3126 $self->remove ($_) for @other;
2613 3127
2614 $self->{par} = []; 3128 $self->{par} = [];
2615 $self->{height} = 0; 3129 $self->{height} = 0;
2616 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3130 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617} 3131}
2618 3132
2619sub add_paragraph { 3133sub add_paragraph {
2620 my ($self, $color, $text, $indent) = @_; 3134 my $self = shift;
2621 3135
2622 for my $line (split /\n/, $text) { 3136 for my $para (@_) {
2623 my ($w, $h) = $self->text_size ($line); 3137 $para = {
3138 fg => [1, 1, 1, 1],
3139 indent => 0,
3140 markup => "",
3141 widget => [],
3142 ref $para ? %$para : (markup => $para),
3143 w => 1e10,
3144 wrapped => 1,
3145 };
3146
3147 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3148 push @{$self->{par}}, $para;
3149 }
3150
3151 if (my $max = $self->{max_par}) {
3152 shift @{$self->{par}} while @{$self->{par}} > $max;
3153 }
3154
3155 $self->{need_reflow}++;
3156 $self->update;
3157}
3158
3159sub scroll_to_bottom {
3160 my ($self) = @_;
3161
3162 $self->{scroll_to} = $#{$self->{par}};
3163 $self->update;
3164}
3165
3166sub force_uptodate {
3167 my ($self) = @_;
3168
3169 if (delete $self->{need_reflow}) {
3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3171
3172 my $height = 0;
3173
3174 for my $para (@{$self->{par}}) {
3175 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3176 my $layout = $self->get_layout ($para);
3177 my ($w, $h) = $layout->size;
3178
3179 $para->{w} = $w + $para->{indent};
3180 $para->{h} = $h;
3181 $para->{wrapped} = $layout->has_wrapped;
3182 }
3183
3184 $para->{y} = $height;
3185 $height += $para->{h};
3186 }
3187
2624 $self->{height} += $h; 3188 $self->{height} = $height;
2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3189 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2626 }
2627 3190
2628 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3191 delete $self->{texture};
3192 }
3193
3194 if (my $paridx = delete $self->{scroll_to}) {
3195 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3196 }
2629} 3197}
2630 3198
2631sub update { 3199sub update {
2632 my ($self) = @_; 3200 my ($self) = @_;
2633 3201
… …
2636 return unless $self->{h} > 0; 3204 return unless $self->{h} > 0;
2637 3205
2638 delete $self->{texture}; 3206 delete $self->{texture};
2639 3207
2640 $ROOT->on_post_alloc ($self => sub { 3208 $ROOT->on_post_alloc ($self => sub {
3209 $self->force_uptodate;
3210
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3211 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642 3212
2643 if (delete $self->{need_reflow}) {
2644 my $height = 0;
2645
2646 my $layout = $self->{layout};
2647
2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650 for (@{$self->{par}}) {
2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2652 $layout->set_width ($W - $_->[3]);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654 $layout->set_markup ($_->[4]);
2655 my ($w, $h) = $layout->size;
2656 $_->[0] = $w + $_->[3];
2657 $_->[1] = $h;
2658 }
2659
2660 $height += $_->[1];
2661 }
2662
2663 $self->{height} = $height;
2664
2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2666
2667 delete $self->{texture};
2668 }
2669
2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3213 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2671 glClearColor 0, 0, 0, 0; 3214 glClearColor 0, 0, 0, 0;
2672 glClear GL_COLOR_BUFFER_BIT; 3215 glClear GL_COLOR_BUFFER_BIT;
2673 3216
3217 package CFPlus::UI::Base;
3218 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3219 (0, 0, $self->{w}, $self->{h});
3220
3221 my $top = int $self->{children}[1]{range}[0];
3222
3223 my $paridx = 0;
3224 my $top_paragraph;
2674 my $top = int $self->{children}[1]{range}[0]; 3225 my $top = int $self->{children}[1]{range}[0];
2675 3226
2676 my $y0 = $top; 3227 my $y0 = $top;
2677 my $y1 = $top + $H; 3228 my $y1 = $top + $H;
2678 3229
2679 my $y = 0;
2680
2681 my $layout = $self->{layout};
2682
2683 $layout->set_font ($self->{font}) if $self->{font};
2684
2685 glEnable GL_BLEND;
2686 #TODO# not correct in windows where rgba is forced off
2687 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2688
2689 for my $par (@{$self->{par}}) { 3230 for my $para (@{$self->{par}}) {
2690 my $h = $par->[1]; 3231 my $h = $para->{h};
3232 my $y = $para->{y};
2691 3233
2692 if ($y0 < $y + $h && $y < $y1) { 3234 if ($y0 < $y + $h && $y < $y1) {
2693 $layout->set_foreground (@{ $par->[2] }); 3235 my $layout = $self->get_layout ($para);
2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2696 $layout->set_markup ($par->[4]);
2697 3236
2698 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3237 $layout->render ($para->{indent}, $y - $y0);
2699 3238
2700 glRasterPos $par->[3], $y - $y0; 3239 if (my @w = @{ $para->{widget} }) {
2701 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3240 my @s = $layout->get_shapes;
3241
3242 for (@w) {
3243 my ($dx, $dy) = splice @s, 0, 2, ();
3244
3245 $_->{x} = $dx + $para->{indent};
3246 $_->{y} = $dy + $y - $y0;
3247
3248 $_->draw;
3249 }
3250 }
2702 } 3251 }
2703 3252
2704 $y += $h; 3253 $paridx++;
3254 $top_paragraph ||= $paridx if $y >= $top;
2705 } 3255 }
2706 3256
2707 glDisable GL_BLEND; 3257 $self->{top_paragraph} = $top_paragraph;
2708 }; 3258 };
2709 }); 3259 });
3260}
3261
3262sub reconfigure {
3263 my ($self) = @_;
3264
3265 $self->SUPER::reconfigure;
3266
3267 $_->{w} = 1e10 for @{ $self->{par} };
3268 $self->reflow;
2710} 3269}
2711 3270
2712sub _draw { 3271sub _draw {
2713 my ($self) = @_; 3272 my ($self) = @_;
2714 3273
… …
2717 glColor 0, 0, 0, 1; 3276 glColor 0, 0, 0, 1;
2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3277 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719 glDisable GL_TEXTURE_2D; 3278 glDisable GL_TEXTURE_2D;
2720 3279
2721 $self->{children}[1]->draw; 3280 $self->{children}[1]->draw;
2722
2723} 3281}
2724 3282
2725############################################################################# 3283#############################################################################
2726 3284
2727package CFClient::UI::Animator; 3285package CFPlus::UI::Animator;
2728 3286
2729use CFClient::OpenGL; 3287use CFPlus::OpenGL;
2730 3288
2731our @ISA = CFClient::UI::Bin::; 3289our @ISA = CFPlus::UI::Bin::;
2732 3290
2733sub moveto { 3291sub moveto {
2734 my ($self, $x, $y) = @_; 3292 my ($self, $x, $y) = @_;
2735 3293
2736 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3294 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2764 glPopMatrix; 3322 glPopMatrix;
2765} 3323}
2766 3324
2767############################################################################# 3325#############################################################################
2768 3326
2769package CFClient::UI::Flopper; 3327package CFPlus::UI::Flopper;
2770 3328
2771our @ISA = CFClient::UI::Button::; 3329our @ISA = CFPlus::UI::Button::;
2772 3330
2773sub new { 3331sub new {
2774 my $class = shift; 3332 my $class = shift;
2775 3333
2776 my $self = $class->SUPER::new ( 3334 my $self = $class->SUPER::new (
… …
2788 $self->{other}->toggle_visibility; 3346 $self->{other}->toggle_visibility;
2789} 3347}
2790 3348
2791############################################################################# 3349#############################################################################
2792 3350
2793package CFClient::UI::Tooltip; 3351package CFPlus::UI::Tooltip;
2794 3352
2795our @ISA = CFClient::UI::Bin::; 3353our @ISA = CFPlus::UI::Bin::;
2796 3354
2797use CFClient::OpenGL; 3355use CFPlus::OpenGL;
2798 3356
2799sub new { 3357sub new {
2800 my $class = shift; 3358 my $class = shift;
2801 3359
2802 $class->SUPER::new ( 3360 $class->SUPER::new (
… …
2805 ) 3363 )
2806} 3364}
2807 3365
2808sub set_tooltip_from { 3366sub set_tooltip_from {
2809 my ($self, $widget) = @_; 3367 my ($self, $widget) = @_;
3368
3369 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3370 if $widget->{tooltip} =~ /^#(.*)$/;
2810 3371
2811 my $tooltip = $widget->{tooltip}; 3372 my $tooltip = $widget->{tooltip};
2812 3373
2813 if ($ENV{CFPLUS_DEBUG} & 2) { 3374 if ($ENV{CFPLUS_DEBUG} & 2) {
2814 $tooltip .= "\n\n" . (ref $widget) . "\n" 3375 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2818 } 3379 }
2819 3380
2820 $tooltip =~ s/^\n+//; 3381 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//; 3382 $tooltip =~ s/\n+$//;
2822 3383
2823 $self->add (new CFClient::UI::Label 3384 $self->add (new CFPlus::UI::Label
2824 markup => $tooltip, 3385 markup => $tooltip,
2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3386 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2826 fontsize => 0.8, 3387 fontsize => 0.8,
2827 fg => [0, 0, 0, 1], 3388 style => 1, # FLAG_INVERSE
2828 ellipsise => 0, 3389 ellipsise => 0,
2829 font => ($widget->{tooltip_font} || $::FONT_PROP), 3390 font => ($widget->{tooltip_font} || $::FONT_PROP),
2830 ); 3391 );
2831} 3392}
2832 3393
… …
2851 3412
2852 $self->{root}->on_post_alloc ("move_$self" => sub { 3413 $self->{root}->on_post_alloc ("move_$self" => sub {
2853 my $widget = $self->{owner} 3414 my $widget = $self->{owner}
2854 or return; 3415 or return;
2855 3416
3417 if ($widget->{visible}) {
2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3418 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857 3419
2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3420 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859 if $x + $self->{w} > $self->{root}{w}; 3421 if $x + $self->{w} > $self->{root}{w};
2860 3422
2861 $self->move_abs ($x, $y); 3423 $self->move_abs ($x, $y);
3424 } else {
3425 $self->hide;
3426 }
2862 }); 3427 });
2863} 3428}
2864 3429
2865sub _draw { 3430sub _draw {
2866 my ($self) = @_; 3431 my ($self) = @_;
… …
2890 $self->SUPER::_draw; 3455 $self->SUPER::_draw;
2891} 3456}
2892 3457
2893############################################################################# 3458#############################################################################
2894 3459
2895package CFClient::UI::Face; 3460package CFPlus::UI::Face;
2896 3461
2897our @ISA = CFClient::UI::Base::; 3462our @ISA = CFPlus::UI::DrawBG::;
2898 3463
2899use CFClient::OpenGL; 3464use CFPlus::OpenGL;
2900 3465
2901sub new { 3466sub new {
2902 my $class = shift; 3467 my $class = shift;
2903 3468
2904 my $self = $class->SUPER::new ( 3469 my $self = $class->SUPER::new (
3470 size_w => 32,
3471 size_h => 8,
2905 aspect => 1, 3472 aspect => 1,
2906 can_events => 0, 3473 can_events => 0,
2907 @_, 3474 @_,
2908 ); 3475 );
2909 3476
2910 if ($self->{anim} && $self->{animspeed}) { 3477 if ($self->{anim} && $self->{animspeed}) {
2911 Scalar::Util::weaken (my $widget = $self); 3478 CFPlus::weaken (my $widget = $self);
2912 3479
3480 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3481 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2913 $self->{timer} = Event->timer ( 3482 $self->{timer} = Event->timer (
2914 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2915 hard => 1, 3483 parked => 1,
2916 interval => $self->{animspeed},
2917 cb => sub { 3484 cb => sub {
3485 return unless $::CONN && $widget;
3486
2918 ++$widget->{frame}; 3487 ++$widget->{frame};
3488 $widget->update_face;
2919 $widget->update; 3489 $widget->update;
3490
3491 $widget->update_timer;
2920 }, 3492 },
2921 ); 3493 );
3494
3495 $self->update_face;
3496 $self->update_timer;
2922 } 3497 }
2923 3498
2924 $self 3499 $self
2925} 3500}
2926 3501
3502sub update_timer {
3503 my ($self) = @_;
3504
3505 return unless $self->{timer};
3506
3507 if ($self->{visible}) {
3508 $self->{timer}->at (
3509 $self->{anim_start}
3510 + $self->{animspeed}
3511 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3512 );
3513 $self->{timer}->start;
3514 } else {
3515 $self->{timer}->stop;
3516 }
3517}
3518
3519sub update_face {
3520 my ($self) = @_;
3521
3522 return unless $::CONN;
3523
3524 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3525 if ($anim && @$anim) {
3526 delete $self->{wait_face};
3527 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3528 }
3529 }
3530}
3531
2927sub size_request { 3532sub size_request {
2928 (32, 8) 3533 my ($self) = @_;
3534
3535 if ($::CONN) {
3536 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3537 if (my $tex = $::CONN->{texture}[$faceid]) {
3538 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3539 } else {
3540 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3541 $self->realloc;
3542 });
3543 }
3544 }
3545 }
3546
3547 ($self->{size_w} || 8, $self->{size_h} || 8)
2929} 3548}
2930 3549
2931sub update { 3550sub update {
2932 my ($self) = @_; 3551 my ($self) = @_;
2933 3552
2934 return unless $self->{visible}; 3553 return unless $self->{visible};
2935 3554
2936 $self->SUPER::update; 3555 $self->SUPER::update;
2937} 3556}
2938 3557
3558sub invoke_visibility_change {
3559 my ($self) = @_;
3560
3561 $self->update_timer;
3562
3563 0
3564}
3565
2939sub _draw { 3566sub _draw {
2940 my ($self) = @_; 3567 my ($self) = @_;
2941 3568
2942 return unless $::CONN; 3569 return unless $::CONN;
2943 3570
2944 my $face; 3571 $self->SUPER::_draw;
2945 3572
2946 if ($self->{frame}) {
2947 my $anim = $::CONN->{anim}[$self->{anim}]; 3573 my $faceid = $::CONN->{faceid}[$self->{face}]
2948 3574 or return;
2949 $face = $anim->[ $self->{frame} % @$anim ]
2950 if $anim && @$anim;
2951 }
2952 3575
2953 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3576 my $tex = $::CONN->{texture}[$faceid];
2954 3577
2955 if ($tex) { 3578 if ($tex) {
2956 glEnable GL_TEXTURE_2D; 3579 glEnable GL_TEXTURE_2D;
2957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2958 glColor 0, 0, 0, 1; 3581 glColor 0, 0, 0, 1;
… …
2962} 3585}
2963 3586
2964sub destroy { 3587sub destroy {
2965 my ($self) = @_; 3588 my ($self) = @_;
2966 3589
2967 $self->{timer}->cancel 3590 (delete $self->{timer})->cancel
2968 if $self->{timer}; 3591 if $self->{timer};
2969 3592
2970 $self->SUPER::destroy; 3593 $self->SUPER::destroy;
2971} 3594}
2972 3595
2973############################################################################# 3596#############################################################################
2974 3597
2975package CFClient::UI::Buttonbar; 3598package CFPlus::UI::Buttonbar;
2976 3599
2977our @ISA = CFClient::UI::HBox::; 3600our @ISA = CFPlus::UI::HBox::;
2978 3601
2979# TODO: should actualyl wrap buttons and other goodies. 3602# TODO: should actually wrap buttons and other goodies.
2980 3603
2981############################################################################# 3604#############################################################################
2982 3605
2983package CFClient::UI::Menu; 3606package CFPlus::UI::Menu;
2984 3607
2985our @ISA = CFClient::UI::FancyFrame::; 3608our @ISA = CFPlus::UI::Toplevel::;
2986 3609
2987use CFClient::OpenGL; 3610use CFPlus::OpenGL;
2988 3611
2989sub new { 3612sub new {
2990 my $class = shift; 3613 my $class = shift;
2991 3614
2992 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
2993 items => [], 3616 items => [],
2994 z => 100, 3617 z => 100,
2995 @_, 3618 @_,
2996 ); 3619 );
2997 3620
2998 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3621 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2999 3622
3000 for my $item (@{ $self->{items} }) { 3623 for my $item (@{ $self->{items} }) {
3001 my ($widget, $cb, $tooltip) = @$item; 3624 my ($widget, $cb, $tooltip) = @$item;
3002 3625
3003 # handle various types of items, only text for now 3626 # handle various types of items, only text for now
3004 if (!ref $widget) { 3627 if (!ref $widget) {
3628 if ($widget =~ /\t/) {
3629 my ($left, $right) = split /\t/, $widget, 2;
3630
3005 $widget = new CFClient::UI::Label 3631 $widget = new CFPlus::UI::HBox
3006 can_hover => 1, 3632 can_hover => 1,
3007 can_events => 1, 3633 can_events => 1,
3634 tooltip => $tooltip,
3635 children => [
3636 (new CFPlus::UI::Label markup => $left, expand => 1),
3637 (new CFPlus::UI::Label markup => $right, align => +1),
3638 ],
3639 ;
3640
3641 } else {
3642 $widget = new CFPlus::UI::Label
3643 can_hover => 1,
3644 can_events => 1,
3008 markup => $widget, 3645 markup => $widget,
3009 tooltip => $tooltip 3646 tooltip => $tooltip;
3647 }
3010 } 3648 }
3011 3649
3012 $self->{item}{$widget} = $item; 3650 $self->{item}{$widget} = $item;
3013 3651
3014 $self->{vbox}->add ($widget); 3652 $self->{vbox}->add ($widget);
… …
3057 1 3695 1
3058} 3696}
3059 3697
3060############################################################################# 3698#############################################################################
3061 3699
3062package CFClient::UI::Multiplexer; 3700package CFPlus::UI::Multiplexer;
3063 3701
3064our @ISA = CFClient::UI::Container::; 3702our @ISA = CFPlus::UI::Container::;
3065 3703
3066sub new { 3704sub new {
3067 my $class = shift; 3705 my $class = shift;
3068 3706
3069 my $self = $class->SUPER::new ( 3707 my $self = $class->SUPER::new (
… …
3083 3721
3084 $self->{current} = $self->{children}[0] 3722 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} }; 3723 if @{ $self->{children} };
3086} 3724}
3087 3725
3726sub get_current_page {
3727 my ($self) = @_;
3728
3729 $self->{current}
3730}
3731
3088sub set_current_page { 3732sub set_current_page {
3089 my ($self, $page_or_widget) = @_; 3733 my ($self, $page_or_widget) = @_;
3090 3734
3091 my $widget = ref $page_or_widget 3735 my $widget = ref $page_or_widget
3092 ? $page_or_widget 3736 ? $page_or_widget
… …
3124 $self->{current}->draw; 3768 $self->{current}->draw;
3125} 3769}
3126 3770
3127############################################################################# 3771#############################################################################
3128 3772
3129package CFClient::UI::Notebook; 3773package CFPlus::UI::Notebook;
3130 3774
3131our @ISA = CFClient::UI::VBox::; 3775our @ISA = CFPlus::UI::VBox::;
3132 3776
3133sub new { 3777sub new {
3134 my $class = shift; 3778 my $class = shift;
3135 3779
3136 my $self = $class->SUPER::new ( 3780 my $self = $class->SUPER::new (
3137 buttonbar => (new CFClient::UI::Buttonbar), 3781 buttonbar => (new CFPlus::UI::Buttonbar),
3138 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3782 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3139 # filter => # will be put between multiplexer and $self 3783 # filter => # will be put between multiplexer and $self
3140 @_, 3784 @_,
3141 ); 3785 );
3142 3786
3143 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3787 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3147} 3791}
3148 3792
3149sub add { 3793sub add {
3150 my ($self, $title, $widget, $tooltip) = @_; 3794 my ($self, $title, $widget, $tooltip) = @_;
3151 3795
3152 Scalar::Util::weaken $self; 3796 CFPlus::weaken $self;
3153 3797
3154 $self->{buttonbar}->add (new CFClient::UI::Button 3798 $self->{buttonbar}->add (new CFPlus::UI::Button
3155 markup => $title, 3799 markup => $title,
3156 tooltip => $tooltip, 3800 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) }, 3801 on_activate => sub { $self->set_current_page ($widget) },
3158 ); 3802 );
3159 3803
3160 $self->{multiplexer}->add ($widget); 3804 $self->{multiplexer}->add ($widget);
3161} 3805}
3162 3806
3807sub get_current_page {
3808 my ($self) = @_;
3809
3810 $self->{multiplexer}->get_current_page
3811}
3812
3163sub set_current_page { 3813sub set_current_page {
3164 my ($self, $page) = @_; 3814 my ($self, $page) = @_;
3165 3815
3166 $self->{multiplexer}->set_current_page ($page); 3816 $self->{multiplexer}->set_current_page ($page);
3167 $self->emit (page_changed => $self->{multiplexer}{current}); 3817 $self->emit (page_changed => $self->{multiplexer}{current});
3168} 3818}
3169 3819
3170############################################################################# 3820#############################################################################
3171 3821
3172package CFClient::UI::Combobox; 3822package CFPlus::UI::Selector;
3173 3823
3174use utf8; 3824use utf8;
3175 3825
3176our @ISA = CFClient::UI::Button::; 3826our @ISA = CFPlus::UI::Button::;
3177 3827
3178sub new { 3828sub new {
3179 my $class = shift; 3829 my $class = shift;
3180 3830
3181 my $self = $class->SUPER::new ( 3831 my $self = $class->SUPER::new (
… …
3198 my ($value, $title, $tooltip) = @$_; 3848 my ($value, $title, $tooltip) = @$_;
3199 3849
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3850 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 } 3851 }
3202 3852
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3853 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204} 3854}
3205 3855
3206sub _set_value { 3856sub _set_value {
3207 my ($self, $value) = @_; 3857 my ($self, $value) = @_;
3208 3858
… …
3223 $self->emit (changed => $value); 3873 $self->emit (changed => $value);
3224} 3874}
3225 3875
3226############################################################################# 3876#############################################################################
3227 3877
3228package CFClient::UI::Statusbox; 3878package CFPlus::UI::Statusbox;
3229 3879
3230our @ISA = CFClient::UI::VBox::; 3880our @ISA = CFPlus::UI::VBox::;
3231 3881
3232sub new { 3882sub new {
3233 my $class = shift; 3883 my $class = shift;
3234 3884
3235 my $self = $class->SUPER::new ( 3885 my $self = $class->SUPER::new (
3236 fontsize => 0.8, 3886 fontsize => 0.8,
3237 @_, 3887 @_,
3238 ); 3888 );
3239 3889
3240 Scalar::Util::weaken (my $this = $self); 3890 CFPlus::weaken (my $this = $self);
3241 3891
3242 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3892 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3243 3893
3244 $self 3894 $self
3245} 3895}
… …
3247sub reorder { 3897sub reorder {
3248 my ($self) = @_; 3898 my ($self) = @_;
3249 my $NOW = Time::HiRes::time; 3899 my $NOW = Time::HiRes::time;
3250 3900
3251 # freeze display when hovering over any label 3901 # freeze display when hovering over any label
3252 return if $CFClient::UI::TOOLTIP->{owner} 3902 return if $CFPlus::UI::TOOLTIP->{owner}
3253 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3903 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3254 values %{ $self->{item} }; 3904 values %{ $self->{item} };
3255 3905
3256 while (my ($k, $v) = each %{ $self->{item} }) { 3906 while (my ($k, $v) = each %{ $self->{item} }) {
3257 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3907 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3258 } 3908 }
… …
3279 for ($short) { 3929 for ($short) {
3280 s/^\s+//; 3930 s/^\s+//;
3281 s/\s+/ /g; 3931 s/\s+/ /g;
3282 } 3932 }
3283 3933
3284 new CFClient::UI::Label 3934 new CFPlus::UI::Label
3285 markup => $short, 3935 markup => $short,
3286 tooltip => $item->{tooltip}, 3936 tooltip => $item->{tooltip},
3287 tooltip_font => $::FONT_PROP, 3937 tooltip_font => $::FONT_PROP,
3288 tooltip_width => 0.67, 3938 tooltip_width => 0.67,
3289 fontsize => $item->{fontsize} || $self->{fontsize}, 3939 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3343 count => 1, 3993 count => 1,
3344 %arg, 3994 %arg,
3345 }; 3995 };
3346 } 3996 }
3347 3997
3998 $ROOT->on_refresh (reorder => sub {
3348 $self->reorder; 3999 $self->reorder;
4000 });
3349} 4001}
3350 4002
3351sub reconfigure { 4003sub reconfigure {
3352 my ($self) = @_; 4004 my ($self) = @_;
3353 4005
… …
3366 $self->SUPER::destroy; 4018 $self->SUPER::destroy;
3367} 4019}
3368 4020
3369############################################################################# 4021#############################################################################
3370 4022
3371package CFClient::UI::Inventory;
3372
3373our @ISA = CFClient::UI::ScrolledWindow::;
3374
3375sub new {
3376 my $class = shift;
3377
3378 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3380 @_,
3381 );
3382
3383 $self
3384}
3385
3386sub set_items {
3387 my ($self, $items) = @_;
3388
3389 $self->{child}->clear;
3390 return unless $items;
3391
3392 my @items = sort {
3393 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name})
3395 } @$items;
3396
3397 $self->{real_items} = \@items;
3398
3399 my $row = 0;
3400 for my $item (@items) {
3401 CFClient::Item::update_widgets $item;
3402
3403 $self->{child}->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget});
3406
3407 $row++;
3408 }
3409}
3410
3411#############################################################################
3412
3413package CFClient::UI::BindEditor;
3414
3415our @ISA = CFClient::UI::FancyFrame::;
3416
3417sub new {
3418 my $class = shift;
3419
3420 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422 $self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426 text => "start recording",
3427 tooltip => "Start/Stops recording of actions."
3428 ."All subsequent actions after the recording started will be captured."
3429 ."The actions are displayed after the record was stopped."
3430 ."To bind the action you have to click on the 'Bind' button",
3431 on_activate => sub {
3432 unless ($self->{recording}) {
3433 $self->start;
3434 } else {
3435 $self->stop;
3436 }
3437 });
3438
3439 $vb->add (new CFClient::UI::Label text => "Actions:");
3440 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3443 $vb->add (my $hb = new CFClient::UI::HBox);
3444 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445 $hb->add (new CFClient::UI::Button
3446 text => "bind",
3447 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448 on_activate => sub {
3449 $self->ask_for_bind;
3450 });
3451
3452 $vb->add (my $hb = new CFClient::UI::HBox);
3453 $hb->add (new CFClient::UI::Button
3454 text => "ok",
3455 expand => 1,
3456 tooltip => "This closes the binding editor and saves the binding",
3457 on_activate => sub {
3458 $self->hide;
3459 $self->commit;
3460 });
3461
3462 $hb->add (new CFClient::UI::Button
3463 text => "cancel",
3464 expand => 1,
3465 tooltip => "This closes the binding editor without saving",
3466 on_activate => sub {
3467 $self->hide;
3468 $self->{binding_cancel}->()
3469 if $self->{binding_cancel};
3470 });
3471
3472 $self->update_binding_widgets;
3473
3474 $self
3475}
3476
3477sub commit {
3478 my ($self) = @_;
3479 my ($mod, $sym, $cmds) = $self->get_binding;
3480 if ($sym != 0 && @$cmds > 0) {
3481 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482 ."'. Don't forget 'Save Config'!");
3483 $self->{binding_change}->($mod, $sym, $cmds)
3484 if $self->{binding_change};
3485 } else {
3486 $::STATUSBOX->add ("No action bound, no key or action specified!");
3487 $self->{binding_cancel}->()
3488 if $self->{binding_cancel};
3489 }
3490}
3491
3492sub start {
3493 my ($self) = @_;
3494
3495 $self->{rec_btn}->set_text ("stop recording");
3496 $self->{recording} = 1;
3497 $self->clear_command_list;
3498 $::CONN->start_record if $::CONN;
3499}
3500
3501sub stop {
3502 my ($self) = @_;
3503
3504 $self->{rec_btn}->set_text ("start recording");
3505 $self->{recording} = 0;
3506
3507 my $rec;
3508 $rec = $::CONN->stop_record if $::CONN;
3509 return unless ref $rec eq 'ARRAY';
3510 $self->set_command_list ($rec);
3511}
3512
3513
3514sub ask_for_bind_and_commit {
3515 my ($self) = @_;
3516 $self->ask_for_bind (1);
3517}
3518
3519sub ask_for_bind {
3520 my ($self, $commit, $end_cb) = @_;
3521
3522 CFClient::Binder::open_binding_dialog (sub {
3523 my ($mod, $sym) = @_;
3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525 $self->update_binding_widgets;
3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3528 });
3529}
3530
3531# $mod and $sym are the modifiers and key symbol
3532# $cmds is a array ref of strings (the commands)
3533# $cb is the callback that is executed on OK
3534# $ccb is the callback that is executed on CANCEL and
3535# when the binding was unsuccessful on OK
3536sub set_binding {
3537 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539 $self->clear_command_list;
3540 $self->{recording} = 0;
3541 $self->{rec_btn}->set_text ("start recording");
3542
3543 $self->{binding} = [$mod, $sym];
3544 $self->{commands} = $cmds;
3545
3546 $self->{binding_change} = $cb;
3547 $self->{binding_cancel} = $ccb;
3548
3549 $self->update_binding_widgets;
3550}
3551
3552# this is a shortcut method that asks for a binding
3553# and then just binds it.
3554sub do_quick_binding {
3555 my ($self, $cmds, $end_cb) = @_;
3556 $self->set_binding (undef, undef, $cmds, sub {
3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558 });
3559 $self->ask_for_bind (1, $end_cb);
3560}
3561
3562sub update_binding_widgets {
3563 my ($self) = @_;
3564 my ($mod, $sym, $cmds) = $self->get_binding;
3565 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566 $self->set_command_list ($cmds);
3567}
3568
3569sub get_binding {
3570 my ($self) = @_;
3571 return (
3572 $self->{binding}->[0],
3573 $self->{binding}->[1],
3574 [ grep { defined $_ } @{$self->{commands}} ]
3575 );
3576}
3577
3578sub clear_command_list {
3579 my ($self) = @_;
3580 $self->{cmdbox}->clear ();
3581}
3582
3583sub set_command_list {
3584 my ($self, $cmds) = @_;
3585
3586 $self->{cmdbox}->clear ();
3587 $self->{commands} = $cmds;
3588
3589 my $idx = 0;
3590
3591 for (@$cmds) {
3592 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594 my $i = $idx;
3595 $hb->add (new CFClient::UI::Label text => $_);
3596 $hb->add (new CFClient::UI::Button
3597 text => "delete",
3598 tooltip => "Deletes the action from the record",
3599 on_activate => sub {
3600 $self->{cmdbox}->remove ($hb);
3601 $cmds->[$i] = undef;
3602 });
3603
3604
3605 $idx++
3606 }
3607}
3608
3609#############################################################################
3610
3611package CFClient::UI::SpellList;
3612
3613our @ISA = CFClient::UI::Table::;
3614
3615sub new {
3616 my $class = shift;
3617
3618 my $self = $class->SUPER::new (
3619 binding => [],
3620 commands => [],
3621 @_,
3622 )
3623}
3624
3625my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3626
3627my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3629my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3635my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637
3638sub rebuild_spell_list {
3639 my ($self) = @_;
3640
3641 $CFClient::UI::ROOT->on_refresh ($self => sub {
3642 $self->clear;
3643
3644 return unless $::CONN;
3645
3646 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651
3652 my $row = 0;
3653
3654 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655 my $spell = $self->{spell}{$_};
3656
3657 $row++;
3658
3659 my $spell_cb = sub {
3660 my ($widget, $ev) = @_;
3661
3662 if ($ev->{button} == 1) {
3663 $::CONN->user_send ("cast $spell->{name}");
3664 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu
3668 items => [
3669 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671 ],
3672 )->popup ($ev);
3673 } else {
3674 return 0;
3675 }
3676
3677 1
3678 };
3679
3680 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681
3682 #TODO: add path info to tooltip
3683 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3684
3685 $self->add (0, $row, new CFClient::UI::Face
3686 face => $spell->{face},
3687 can_hover => 1,
3688 can_events => 1,
3689 tooltip => $tooltip,
3690 on_button_down => $spell_cb,
3691 );
3692
3693 $self->add (1, $row, new CFClient::UI::Label
3694 expand => 1,
3695 text => $spell->{name},
3696 can_hover => 1,
3697 can_events => 1,
3698 tooltip => $tooltip,
3699 on_button_down => $spell_cb,
3700 );
3701
3702 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706 }
3707 });
3708}
3709
3710sub add_spell {
3711 my ($self, $spell) = @_;
3712
3713 $self->{spell}->{$spell->{name}} = $spell;
3714 $self->rebuild_spell_list;
3715}
3716
3717sub remove_spell {
3718 my ($self, $spell) = @_;
3719
3720 delete $self->{spell}->{$spell->{name}};
3721 $self->rebuild_spell_list;
3722}
3723
3724sub clear_spells {
3725 my ($self) = @_;
3726
3727 $self->{spell} = {};
3728 $self->rebuild_spell_list;
3729}
3730
3731#############################################################################
3732
3733package CFClient::UI::Root; 4023package CFPlus::UI::Root;
3734 4024
3735our @ISA = CFClient::UI::Container::; 4025our @ISA = CFPlus::UI::Container::;
3736 4026
3737use List::Util qw(min max); 4027use List::Util qw(min max);
3738 4028
3739use CFClient::OpenGL; 4029use CFPlus::OpenGL;
3740 4030
3741sub new { 4031sub new {
3742 my $class = shift; 4032 my $class = shift;
3743 4033
3744 my $self = $class->SUPER::new ( 4034 my $self = $class->SUPER::new (
3745 visible => 1, 4035 visible => 1,
3746 @_, 4036 @_,
3747 ); 4037 );
3748 4038
3749 Scalar::Util::weaken ($self->{root} = $self); 4039 CFPlus::weaken ($self->{root} = $self);
3750 4040
3751 $self 4041 $self
3752} 4042}
3753 4043
3754sub size_request { 4044sub size_request {
… …
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4210 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921 4211
3922 $w = 0 if $w < 0; 4212 $w = 0 if $w < 0;
3923 $h = 0 if $h < 0; 4213 $h = 0 if $h < 0;
3924 4214
4215 $w = max $widget->{min_w}, $w;
4216 $h = max $widget->{min_h}, $h;
4217
4218# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4219# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4220
4221 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4222 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4223
3925 $w = int $w + 0.5; 4224 $w = int $w + 0.5;
3926 $h = int $h + 0.5; 4225 $h = int $h + 0.5;
3927 4226
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4227 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w}; 4228 $widget->{old_w} = $widget->{w};
… …
3939 4238
3940 while ($self->{post_alloc_hook}) { 4239 while ($self->{post_alloc_hook}) {
3941 $_->() 4240 $_->()
3942 for values %{delete $self->{post_alloc_hook}}; 4241 for values %{delete $self->{post_alloc_hook}};
3943 } 4242 }
3944
3945 4243
3946 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4244 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3947 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4245 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3948 glClear GL_COLOR_BUFFER_BIT; 4246 glClear GL_COLOR_BUFFER_BIT;
3949 4247
… …
3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4250 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953 glMatrixMode GL_MODELVIEW; 4251 glMatrixMode GL_MODELVIEW;
3954 glLoadIdentity; 4252 glLoadIdentity;
3955 4253
3956 { 4254 {
3957 package CFClient::UI::Base; 4255 package CFPlus::UI::Base;
3958 4256
3959 ($draw_x, $draw_y, $draw_w, $draw_h) = 4257 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h}); 4258 (0, 0, $self->{w}, $self->{h});
3961 }
3962 4259
3963 $self->_draw; 4260 $self->_draw;
4261 }
3964} 4262}
3965 4263
3966############################################################################# 4264#############################################################################
3967 4265
3968package CFClient::UI; 4266package CFPlus::UI;
3969 4267
3970$ROOT = new CFClient::UI::Root; 4268$ROOT = new CFPlus::UI::Root;
3971$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4269$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3972 4270
39731 42711
3974 4272

Diff Legend

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