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.311 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.414 by root, Mon Jul 23 17:54:14 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
… …
345 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
346 380
347 if ($self->{aspect}) { 381 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
349 383
350 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 386
353 # use alignment to adjust x, y 387 # use alignment to adjust x, y
354 388
355 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
397 431
398 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
399 433
400 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
401 435
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 439 }
406} 440}
407 441
408# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
409sub coord2local { 443sub coord2local {
410 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
411 445
446 Carp::confess unless $self->{parent};#d#
447
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 449}
414 450
415# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
416sub coord2global { 452sub coord2global {
417 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
418 454
455 Carp::confess unless $self->{parent};#d#
456
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 458}
421 459
422sub invoke_focus_in { 460sub invoke_focus_in {
423 my ($self) = @_; 461 my ($self) = @_;
424 462
425 return if $FOCUS == $self; 463 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
427 465
428 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
429 467
430 $focus->update if $focus; 468 $self->update;
431 $FOCUS->update;
432 469
433 0 470 0
434} 471}
435 472
436sub invoke_focus_out { 473sub invoke_focus_out {
437 my ($self) = @_; 474 my ($self) = @_;
438 475
439 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
440 477
441 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
442 479
443 $focus->update if $focus; #? 480 $self->update;
444 481
445 $::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
446 unless $FOCUS; 483 unless $FOCUS;
447 484
448 0 485 0
449} 486}
450 487
451sub grab_focus { 488sub grab_focus {
452 my ($self) = @_; 489 my ($self) = @_;
453 490
491 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 492 $self->emit ("focus_in");
455} 493}
456 494
457sub invoke_mouse_motion { 1 } 495sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 496sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 497sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
461 500
462sub invoke_button_down { 501sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
464 503
465 $self->grab_focus; 504 $self->grab_focus;
466 505
467 1 506 0
468} 507}
469 508
470sub connect { 509sub connect {
471 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
472 511
473 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 }
474} 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);
475 532
476sub emit { 533sub emit {
477 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
478 535
479 #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
480 (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
481 || ($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
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 554}
484 555
485sub find_widget { 556#sub find_widget {
486 my ($self, $x, $y) = @_; 557# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 558
497sub set_parent { 559sub set_parent {
498 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
499 561
500 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
502} 564}
503 565
504sub realloc { 566sub realloc {
505 my ($self) = @_; 567 my ($self) = @_;
… …
531 593
532# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless. 595# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535 597
536sub draw { 598#sub draw {
537 my ($self) = @_; 599#CFPlus.xs
538
539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550
551 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0;
553
554 if ($self == $HOVER && $self->{can_hover}) {
555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
556 glEnable GL_BLEND;
557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
558 glBegin GL_QUADS;
559 glVertex 0 , 0;
560 glVertex $self->{w}, 0;
561 glVertex $self->{w}, $self->{h};
562 glVertex 0 , $self->{h};
563 glEnd;
564 glDisable GL_BLEND;
565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
577 glPopMatrix;
578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579 }
580
581 $self->_draw;
582 glPopMatrix;
583}
584 600
585sub _draw { 601sub _draw {
586 my ($self) = @_; 602 my ($self) = @_;
587 603
588 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
589} 605}
590 606
591sub DESTROY { 607sub DESTROY {
592 my ($self) = @_; 608 my ($self) = @_;
593 609
594 delete $WIDGET{$self+0}; 610 return if CFPlus::in_destruct;
595 611
596 eval { $self->destroy }; 612 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
615 delete $WIDGET{$self+0};
598} 616}
599 617
600############################################################################# 618#############################################################################
601 619
602package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
603 621
604our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
605 623
606use strict; 624use strict;
607use CFClient::OpenGL; 625use CFPlus::OpenGL;
608 626
609sub new { 627sub new {
610 my $class = shift; 628 my $class = shift;
611 629
612 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
643 } 661 }
644} 662}
645 663
646############################################################################# 664#############################################################################
647 665
648package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
649 667
650our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
651 669
652sub new { 670sub new {
653 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
655} 673}
… …
662 680
663sub draw { } 681sub draw { }
664 682
665############################################################################# 683#############################################################################
666 684
667package CFClient::UI::Container; 685package CFPlus::UI::Container;
668 686
669our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
670 688
671sub new { 689sub new {
672 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
673 691
674 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
678 can_events => 0, 696 can_events => 0,
679 %arg, 697 %arg,
680 ); 698 );
681 699
682 $self->add (@$children) 700 $self->add (@$children)
683 if $children; 701 if $children && @$children;
684 702
685 $self 703 $self
704}
705
706sub realloc {
707 my ($self) = @_;
708
709 $self->{force_realloc} = 1;
710 $self->{force_size_alloc} = 1;
711 $self->SUPER::realloc;
686} 712}
687 713
688sub add { 714sub add {
689 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
690 716
691 $_->set_parent ($self) 717 $_->set_parent ($self)
692 for @widgets; 718 for @widgets;
693 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
694 use sort 'stable'; 721 use sort 'stable';
695 722
696 $self->{children} = [ 723 $self->{children} = [
697 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
698 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
699 ]; 726 ];
700 727
701 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
702} 733}
703 734
704sub children { 735sub children {
705 @{ $_[0]{children} } 736 @{ $_[0]{children} }
706} 737}
707 738
708sub remove { 739sub remove {
709 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
710 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
711 delete $child->{parent}; 745 delete $child->{parent};
712 $child->hide; 746 $child->hide;
713
714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
715 749
716 $self->realloc; 750 $self->realloc;
717} 751}
718 752
719sub clear { 753sub clear {
720 my ($self) = @_; 754 my ($self) = @_;
721 755
722 my $children = delete $self->{children}; 756 my $children = $self->{children};
723 $self->{children} = []; 757 $self->{children} = [];
724 758
725 for (@$children) { 759 for (@$children) {
726 delete $_->{parent}; 760 delete $_->{parent};
727 $_->hide; 761 $_->hide;
… …
747} 781}
748 782
749sub _draw { 783sub _draw {
750 my ($self) = @_; 784 my ($self) = @_;
751 785
752 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
753} 787}
754 788
755############################################################################# 789#############################################################################
756 790
757package CFClient::UI::Bin; 791package CFPlus::UI::Bin;
758 792
759our @ISA = CFClient::UI::Container::; 793our @ISA = CFPlus::UI::Container::;
760 794
761sub new { 795sub new {
762 my ($class, %arg) = @_; 796 my ($class, %arg) = @_;
763 797
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 798 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 799
766 $class->SUPER::new (children => [$child], %arg) 800 $class->SUPER::new (children => [$child], %arg)
767} 801}
768 802
769sub add { 803sub add {
770 my ($self, $child) = @_; 804 my ($self, $child) = @_;
771 805
772 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
773 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
774} 808}
775 809
776sub remove { 810sub remove {
777 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
778 812
779 $self->SUPER::remove ($widget); 813 $self->SUPER::remove ($widget);
780 814
781 $self->{children} = [new CFClient::UI::Empty] 815 $self->{children} = [new CFPlus::UI::Empty]
782 unless @{$self->{children}}; 816 unless @{$self->{children}};
783} 817}
784 818
785sub child { $_[0]->{children}[0] } 819sub child { $_[0]->{children}[0] }
786 820
… …
798 832
799############################################################################# 833#############################################################################
800 834
801# back-buffered drawing area 835# back-buffered drawing area
802 836
803package CFClient::UI::Window; 837package CFPlus::UI::Window;
804 838
805our @ISA = CFClient::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
806 840
807use CFClient::OpenGL; 841use CFPlus::OpenGL;
808 842
809sub new { 843sub new {
810 my ($class, %arg) = @_; 844 my ($class, %arg) = @_;
811 845
812 my $self = $class->SUPER::new (%arg); 846 my $self = $class->SUPER::new (%arg);
… …
834} 868}
835 869
836sub render_child { 870sub render_child {
837 my ($self) = @_; 871 my ($self) = @_;
838 872
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 873 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 874 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 875 glClear GL_COLOR_BUFFER_BIT;
842 876
843 { 877 {
844 package CFClient::UI::Base; 878 package CFPlus::UI::Base;
845 879
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 880 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 881 (0, 0, $self->{w}, $self->{h});
882
883 $self->_render;
848 } 884 }
849
850 $self->_render;
851 }; 885 };
852} 886}
853 887
854sub _draw { 888sub _draw {
855 my ($self) = @_; 889 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 890
859 my $tex = $self->{texture} 891 my $tex = $self->{texture}
860 or return; 892 or return;
861 893
862 glEnable GL_TEXTURE_2D; 894 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 896 glColor 0, 0, 0, 1;
865 897
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 898 $tex->draw_quad_alpha_premultiplied (0, 0);
867 899
868 glDisable GL_TEXTURE_2D; 900 glDisable GL_TEXTURE_2D;
869} 901}
870 902
871############################################################################# 903#############################################################################
872 904
873package CFClient::UI::ViewPort; 905package CFPlus::UI::ViewPort;
874 906
907use List::Util qw(min max);
908
875our @ISA = CFClient::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
876 910
877sub new { 911sub new {
878 my $class = shift; 912 my $class = shift;
879 913
880 $class->SUPER::new ( 914 $class->SUPER::new (
… …
887sub size_request { 921sub size_request {
888 my ($self) = @_; 922 my ($self) = @_;
889 923
890 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
891 925
892 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
894 928
895 ($w, $h) 929 ($w, $h)
896} 930}
897 931
898sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
910} 944}
911 945
912sub set_offset { 946sub set_offset {
913 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
914 948
949 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
950 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
951
952 if ($x != $self->{view_x} or $y != $self->{view_y}) {
915 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
916 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
917 955
956 $self->emit (changed => $x, $y);
918 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
976 }
919} 977}
920 978
921# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
922sub coord2local { 980sub coord2local {
923 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
938 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
939 997
940 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
942 ) { 1000 ) {
943 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944 } else { 1002 } else {
945 $self->CFClient::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
946 } 1004 }
947} 1005}
948 1006
949sub _render { 1007sub _render {
950 my ($self) = @_; 1008 my ($self) = @_;
951 1009
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1010 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1011 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954 1012
955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1013 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956 1014
957 $self->SUPER::_render; 1015 $self->SUPER::_render;
958} 1016}
959 1017
960############################################################################# 1018#############################################################################
961 1019
962package CFClient::UI::ScrolledWindow; 1020package CFPlus::UI::ScrolledWindow;
963 1021
964our @ISA = CFClient::UI::HBox::; 1022our @ISA = CFPlus::UI::Table::;
965 1023
966sub new { 1024sub new {
967 my ($class, %arg) = @_; 1025 my ($class, %arg) = @_;
968 1026
969 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
970 1028
971 my $self; 1029 my $self;
972 1030
973 my $slider = new CFClient::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 col => 0,
1033 row => 1,
1034 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub {
1037 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 },
1040 ;
1041
1042 my $vslider = new CFPlus::UI::Slider
1043 col => 1,
1044 row => 0,
974 vertical => 1, 1045 vertical => 1,
975 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
976 on_changed => sub { 1047 on_changed => sub {
977 $self->{vp}->set_offset (0, $_[1]); 1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978 }, 1050 },
979 ; 1051 ;
980 1052
981 $self = $class->SUPER::new ( 1053 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1), 1054 scroll_x => 0,
1055 scroll_y => 1,
1056 can_events => 1,
983 slider => $slider, 1057 hslider => $hslider,
1058 vslider => $vslider,
1059 col_expand => [1, 0],
1060 row_expand => [1, 0],
984 %arg, 1061 %arg,
985 ); 1062 );
986 1063
1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 col => 0,
1066 row => 0,
1067 expand => 1,
1068 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y},
1070 on_changed => sub {
1071 my ($vp, $x, $y) = @_;
1072
1073 $vp->{parent}{hslider}->set_value ($x);
1074 $vp->{parent}{vslider}->set_value ($y);
1075
1076 0
1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1083 ;
1084
987 $self->SUPER::add ($self->{vp}, $self->{slider}); 1085 $self->SUPER::add ($self->{vp});
1086
988 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
989 1088
990 $self 1089 $self
991} 1090}
992 1091
… …
994 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
995 1094
996 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
997} 1096}
998 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
999sub update { 1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 if ($self->{scroll_x}) {
1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1110
1111 my $visible = $w1 > $w2;
1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1114 $visible ? $self->SUPER::add ($self->{hslider})
1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1117 }
1118
1119 if ($self->{scroll_y}) {
1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1122
1123 my $visible = $h1 > $h2;
1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1129 }
1130}
1131
1132sub start_dragging {
1000 my ($self) = @_; 1133 my ($self, $ev) = @_;
1001 1134
1002 $self->SUPER::update; 1135 $self->grab_focus;
1003 1136
1004 # todo: overwrite size_allocate of child 1137 my $ox = $self->{vp}{view_x};
1005 my $child = $self->{vp}->child; 1138 my $oy = $self->{vp}{view_y};
1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1139
1140 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_;
1142
1143 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel};
1145
1146 $self->{vp}->set_offset ($ox, $oy);
1147 };
1148}
1149
1150sub invoke_mouse_wheel {
1151 my ($self, $ev) = @_;
1152
1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1155
1156 1
1157}
1158
1159sub invoke_button_down {
1160 my ($self, $ev, $x, $y) = @_;
1161
1162 if ($ev->{button} == 2) {
1163 $self->start_dragging ($ev);
1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1007} 1189}
1008 1190
1009sub invoke_size_allocate { 1191sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1011 1193
1012 my $child = $self->{vp}->child; 1194 $self->update_slider;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1196}
1017 1197
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020
1021############################################################################# 1198#############################################################################
1022 1199
1023package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
1024 1201
1025our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
1026 1203
1027use CFClient::OpenGL; 1204use CFPlus::OpenGL;
1028 1205
1029sub new { 1206sub new {
1030 my $class = shift; 1207 my $class = shift;
1031 1208
1032 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1059} 1236}
1060 1237
1061############################################################################# 1238#############################################################################
1062 1239
1063package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1064 1241
1065our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1066 1243
1067use CFClient::OpenGL; 1244use CFPlus::OpenGL;
1245
1246sub new {
1247 my ($class, %arg) = @_;
1248
1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1068 1345
1069my $bg = 1346my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1348 mipmap => 1, wrap => 1;
1072 1349
1073my @border = 1350my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353
1354my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png);
1076 1357
1077sub new { 1358sub new {
1078 my ($class, %arg) = @_; 1359 my ($class, %arg) = @_;
1079 1360
1080 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1362 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1363 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1364 border => 0.6,
1084 can_events => 1, 1365 can_events => 1,
1085 min_w => 16, 1366 min_w => 64,
1086 min_h => 16, 1367 min_h => 32,
1087 %arg, 1368 %arg,
1088 ); 1369 );
1089 1370
1090 $self->{title_widget} = new CFClient::UI::Label 1371 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1372 align => 0,
1092 valign => 1, 1373 valign => 1,
1093 text => $self->{title}, 1374 text => $self->{title},
1094 fontsize => $self->{border}, 1375 fontsize => $self->{border},
1095 if exists $self->{title}; 1376 if exists $self->{title};
1096 1377
1097 if ($self->{has_close_button}) { 1378 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1379 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1380 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1381 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1382 on_activate => sub { $self->emit ("delete") };
1102 1383
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1384 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1385 }
1105 1386
1106 $self 1387 $self
1107} 1388}
1108 1389
1109sub add { 1390sub add {
1110 my ($self, @widgets) = @_; 1391 my ($self, @widgets) = @_;
1111 1392
1112 $self->SUPER::add (@widgets); 1393 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1394 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1395 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1396}
1116 1397
1117sub border { 1398sub border {
1118 int $_[0]{border} * $::FONTSIZE 1399 int $_[0]{border} * $::FONTSIZE
1119} 1400}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1433 $self->child->configure ($border, $border, $w, $h);
1153 1434
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1435 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1436 if $self->{close_button};
1156 1437
1438 1
1439}
1440
1441sub invoke_delete {
1442 my ($self) = @_;
1443
1444 $self->hide;
1445
1157 1 1446 1
1158} 1447}
1159 1448
1160sub invoke_button_down { 1449sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1450 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1508 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1509
1221 ! ! $self->{motion} 1510 ! ! $self->{motion}
1222} 1511}
1223 1512
1513sub invoke_visibility_change {
1514 my ($self, $visible) = @_;
1515
1516 delete $self->{motion} unless $visible;
1517
1518 0
1519}
1520
1224sub _draw { 1521sub _draw {
1225 my ($self) = @_; 1522 my ($self) = @_;
1226 1523
1227 my $child = $self->{children}[0]; 1524 my $child = $self->{children}[0];
1228 1525
… …
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234 1531
1235 my $border = $self->border; 1532 my $border = $self->border;
1236 1533
1237 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1238 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539
1540 # move
1541 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546
1547 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242 1553
1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1245 1556
1246 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1265 if $self->{close_button}; 1576 if $self->{close_button};
1266} 1577}
1267 1578
1268############################################################################# 1579#############################################################################
1269 1580
1270package CFClient::UI::Table; 1581package CFPlus::UI::Table;
1271 1582
1272our @ISA = CFClient::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1273 1584
1274use List::Util qw(max sum); 1585use List::Util qw(max sum);
1275 1586
1276use CFClient::OpenGL; 1587use CFPlus::OpenGL;
1277 1588
1278sub new { 1589sub new {
1279 my $class = shift; 1590 my $class = shift;
1280 1591
1281 $class->SUPER::new ( 1592 $class->SUPER::new (
1282 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1283 @_, 1595 @_,
1284 ) 1596 )
1285} 1597}
1286 1598
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289}
1290
1291sub add { 1599sub add {
1292 my ($self, $x, $y, $child) = @_; 1600 my ($self, @widgets) = @_;
1293 1601
1294 $child->set_parent ($self); 1602 for my $child (@widgets) {
1295 $self->{children}[$y][$x] = $child; 1603 $child->{rowspan} ||= 1;
1604 $child->{colspan} ||= 1;
1605 }
1296 1606
1297 $self->realloc; 1607 $self->SUPER::add (@widgets);
1298} 1608}
1299 1609
1300sub remove { 1610sub add_at {
1611 my $self = shift;
1612
1613 my @widgets;
1614
1615 while (@_) {
1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1617
1618 $child->{row} = $row;
1619 $child->{col} = $col;
1620
1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1301 my ($self, $child) = @_; 1628 my ($self) = @_;
1302 1629
1303 # TODO: not yet implemented 1630 my (@w, @h);
1304}
1305
1306# TODO: move to container class maybe? send children a signal on removal?
1307sub clear {
1308 my ($self) = @_;
1309 1631
1310 my @children = $self->children; 1632 my @children = $self->children;
1311 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1312 1643 }
1313 for (@children) {
1314 delete $_->{parent};
1315 $_->hide;
1316 }
1317 1644
1318 $self->realloc; 1645 # second pass, rows
1319} 1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1320
1321sub get_wh {
1322 my ($self) = @_;
1323
1324 my (@w, @h);
1325
1326 for my $y (0 .. $#{$self->{children}}) {
1327 my $row = $self->{children}[$y]
1328 or next;
1329
1330 for my $x (0 .. $#$row) {
1331 my $widget = $row->[$x]
1332 or next;
1333 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1334 1648
1335 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1336 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337 } 1653 }
1338 } 1654 }
1339 1655
1340 (\@w, \@h) 1656 (\@w, \@h)
1341} 1657}
… …
1357 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1358 1674
1359 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1361 1677
1362 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1363 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1366 1682
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1684
1371 CFClient::UI::harmonize $ws; 1685 CFPlus::UI::harmonize $ws;
1686
1687 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1;
1690
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692
1372 CFClient::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1373 1694
1374 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375 1697
1376 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1377 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1378 or next;
1379 1700
1380 my $x = 0; 1701 $widget->configure (
1381 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382 1704 );
1383 for my $c (0 .. $#$row) { 1705 }
1384 my $col_w = $ws->[$c];
1385 1706
1386 if (my $widget = $row->[$c]) { 1707 1
1387 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1388 }
1389 1709
1390 $x += $col_w; 1710#############################################################################
1711
1712package CFPlus::UI::Fixed;
1713
1714use List::Util qw(min max);
1715
1716our @ISA = CFPlus::UI::Container::;
1717
1718sub _scale($$$) {
1719 my ($rel, $val, $max) = @_;
1720
1721 $rel ? $val * $max : $val
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1728
1729 # determine overall size by querying abs widgets
1730 for my $child ($self->visible_children) {
1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1734
1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1391 } 1737 }
1738 }
1392 1739
1393 $y += $row_h; 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1742
1743 # now layout remaining widgets
1744 for my $child ($self->visible_children) {
1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 }
1752 }
1753
1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 ($W, $H)
1758}
1759
1760sub invoke_size_allocate {
1761 my ($self, $W, $H) = @_;
1762
1763 for my $child ($self->visible_children) {
1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766
1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1769
1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1394 } 1771 }
1395 1772
1396 1 1773 1
1397} 1774}
1398 1775
1399sub find_widget {
1400 my ($self, $x, $y) = @_;
1401
1402 $x -= $self->{x};
1403 $y -= $self->{y};
1404
1405 my $res;
1406
1407 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1408 $res = $_->find_widget ($x, $y)
1409 and return $res;
1410 }
1411
1412 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1413}
1414
1415sub _draw {
1416 my ($self) = @_;
1417
1418 for (grep $_, @{$self->{children}}) {
1419 $_->draw for grep $_, @$_;
1420 }
1421}
1422
1423############################################################################# 1776#############################################################################
1424 1777
1425package CFClient::UI::Box; 1778package CFPlus::UI::Box;
1426 1779
1427our @ISA = CFClient::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1428 1781
1429sub size_request { 1782sub size_request {
1430 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1431 1786
1432 $self->{vertical} 1787 $self->{vertical}
1433 ? ( 1788 ? (
1434 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1435 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1436 ) 1791 )
1437 : ( 1792 : (
1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1439 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1440 ) 1795 )
1441} 1796}
1442 1797
1443sub invoke_size_allocate { 1798sub invoke_size_allocate {
1444 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1465 $req[$_] += $space * $children[$_]{expand} 1820 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1821 for 0 .. $#children;
1467 } 1822 }
1468 } 1823 }
1469 1824
1470 CFClient::UI::harmonize \@req; 1825 CFPlus::UI::harmonize \@req;
1471 1826
1472 my $pos = 0; 1827 my $pos = 0;
1473 for (0 .. $#children) { 1828 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1829 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1830 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1835 1
1481} 1836}
1482 1837
1483############################################################################# 1838#############################################################################
1484 1839
1485package CFClient::UI::HBox; 1840package CFPlus::UI::HBox;
1486 1841
1487our @ISA = CFClient::UI::Box::; 1842our @ISA = CFPlus::UI::Box::;
1488 1843
1489sub new { 1844sub new {
1490 my $class = shift; 1845 my $class = shift;
1491 1846
1492 $class->SUPER::new ( 1847 $class->SUPER::new (
… …
1495 ) 1850 )
1496} 1851}
1497 1852
1498############################################################################# 1853#############################################################################
1499 1854
1500package CFClient::UI::VBox; 1855package CFPlus::UI::VBox;
1501 1856
1502our @ISA = CFClient::UI::Box::; 1857our @ISA = CFPlus::UI::Box::;
1503 1858
1504sub new { 1859sub new {
1505 my $class = shift; 1860 my $class = shift;
1506 1861
1507 $class->SUPER::new ( 1862 $class->SUPER::new (
… …
1510 ) 1865 )
1511} 1866}
1512 1867
1513############################################################################# 1868#############################################################################
1514 1869
1515package CFClient::UI::Label; 1870package CFPlus::UI::Label;
1516 1871
1517our @ISA = CFClient::UI::DrawBG::; 1872our @ISA = CFPlus::UI::DrawBG::;
1518 1873
1519use CFClient::OpenGL; 1874use CFPlus::OpenGL;
1520 1875
1521sub new { 1876sub new {
1522 my ($class, %arg) = @_; 1877 my ($class, %arg) = @_;
1523 1878
1524 my $self = $class->SUPER::new ( 1879 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1882 #active_bg => none
1528 #font => default_font 1883 #font => default_font
1529 #text => initial text 1884 #text => initial text
1530 #markup => initial narkup 1885 #markup => initial narkup
1531 #max_w => maximum pixel width 1886 #max_w => maximum pixel width
1887 #style => 0, # render flags
1532 ellipsise => 3, # end 1888 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1889 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1890 fontsize => 1,
1535 align => -1, 1891 align => -1,
1536 valign => -1, 1892 valign => -1,
1537 padding_x => 2, 1893 padding_x => 2,
1538 padding_y => 2, 1894 padding_y => 2,
1539 can_events => 0, 1895 can_events => 0,
1540 %arg 1896 %arg
1541 ); 1897 );
1542 1898
1543 if (exists $self->{template}) { 1899 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1900 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1901 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1902 $self->{template} = $layout;
1547 } 1903 }
1548 1904
1549 if (exists $self->{markup}) { 1905 if (exists $self->{markup}) {
… …
1553 } 1909 }
1554 1910
1555 $self 1911 $self
1556} 1912}
1557 1913
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1914sub update {
1569 my ($self) = @_; 1915 my ($self) = @_;
1570 1916
1571 delete $self->{texture}; 1917 delete $self->{texture};
1572 $self->SUPER::update; 1918 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1929 my ($self, $text) = @_;
1584 1930
1585 return if $self->{text} eq "T$text"; 1931 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1932 $self->{text} = "T$text";
1587 1933
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1934 $self->{layout}->set_text ($text);
1590 1935
1591 delete $self->{size_req}; 1936 delete $self->{size_req};
1592 $self->realloc; 1937 $self->realloc;
1593 $self->update; 1938 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1944 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1945 $self->{text} = "M$markup";
1601 1946
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1947 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1948
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1949 $self->{layout}->set_markup ($markup);
1606 1950
1607 delete $self->{size_req}; 1951 delete $self->{size_req};
1608 $self->realloc; 1952 $self->realloc;
1609 $self->update; 1953 $self->update;
… …
1621 1965
1622 my ($w, $h) = $self->{layout}->size; 1966 my ($w, $h) = $self->{layout}->size;
1623 1967
1624 if (exists $self->{template}) { 1968 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1969 $self->{template}->set_font ($self->{font}) if $self->{font};
1970 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1972
1628 my ($w2, $h2) = $self->{template}->size; 1973 my ($w2, $h2) = $self->{template}->size;
1629 1974
1630 $w = List::Util::max $w, $w2; 1975 $w = List::Util::max $w, $w2;
… …
1654 1999
1655sub set_fontsize { 2000sub set_fontsize {
1656 my ($self, $fontsize) = @_; 2001 my ($self, $fontsize) = @_;
1657 2002
1658 $self->{fontsize} = $fontsize; 2003 $self->{fontsize} = $fontsize;
2004 delete $self->{size_req};
1659 delete $self->{texture}; 2005 delete $self->{texture};
1660 2006
1661 $self->realloc; 2007 $self->realloc;
1662} 2008}
1663 2009
1664sub reconfigure { 2010sub reconfigure {
1665 my ($self) = @_; 2011 my ($self) = @_;
1666 2012
1667 delete $self->{size_req}; 2013 delete $self->{size_req};
2014 delete $self->{texture};
1668 2015
1669 $self->SUPER::reconfigure; 2016 $self->SUPER::reconfigure;
1670} 2017}
1671 2018
1672sub _draw { 2019sub _draw {
1673 my ($self) = @_; 2020 my ($self) = @_;
1674 2021
1675 $self->SUPER::_draw; # draw background, if applicable 2022 $self->SUPER::_draw; # draw background, if applicable
1676 2023
1677 my $tex = $self->{texture} ||= do { 2024 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 2025 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2026 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 2027 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2028 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2029 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2030 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 2031
1685 new_from_layout CFClient::Texture $self->{layout} 2032 [$self->{layout}->size]
1686 }; 2033 };
1687 2034
1688 unless (exists $self->{ox}) { 2035 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2036 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2037 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 2038 : ($self->{w} - $size->[0]) * 0.5);
1692 2039
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 2043 };
1697 2044
1698 glEnable GL_TEXTURE_2D; 2045# unless ($self->{list}) {
1699 2046# $self->{list} = CFPlus::OpenGL::glGenList;
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2047# CFPlus::OpenGL::glNewList $self->{list};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702 2049# CFPlus::OpenGL::glEndList;
1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 } 2050# }
2051#
2052# CFPlus::OpenGL::glCallList $self->{list};
1711 2053
1712 glDisable GL_TEXTURE_2D; 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713} 2055}
2056
2057#sub destroy {
2058# my ($self) = @_;
2059#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061#
2062# $self->SUPER::destroy;
2063#}
1714 2064
1715############################################################################# 2065#############################################################################
1716 2066
1717package CFClient::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
1718 2068
1719our @ISA = CFClient::UI::Label::; 2069our @ISA = CFPlus::UI::Label::;
1720 2070
1721use CFClient::OpenGL; 2071use CFPlus::OpenGL;
1722 2072
1723sub new { 2073sub new {
1724 my $class = shift; 2074 my $class = shift;
1725 2075
1726 $class->SUPER::new ( 2076 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 2080 active_fg => [0, 0, 0],
1731 can_hover => 1, 2081 can_hover => 1,
1732 can_focus => 1, 2082 can_focus => 1,
1733 valign => 0, 2083 valign => 0,
1734 can_events => 1, 2084 can_events => 1,
2085 ellipsise => 0,
1735 #text => ... 2086 #text => ...
1736 #hidden => "*", 2087 #hidden => "*",
1737 @_ 2088 @_
1738 ) 2089 )
1739} 2090}
… …
1784 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2136 my $uni = $ev->{unicode};
1786 2137
1787 my $text = $self->get_text; 2138 my $text = $self->get_text;
1788 2139
2140 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2141
1789 if ($uni == 8) { 2142 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2143 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2144 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2145 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2146 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2147 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2148 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2149 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 2150 } elsif ($sym == CFPlus::SDLK_HOME) {
2151 # what a hack
2152 $self->{cursor} =
2153 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2154 ? length $1
2155 : 0;
2156 } elsif ($sym == CFPlus::SDLK_END) {
2157 # uh, again
2158 $self->{cursor} =
2159 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2160 ? $self->{cursor} + length $1
2161 : length $self->{text};
2162 } elsif ($uni == 21) { # ctrl-u
2163 $text = "";
1798 $self->{cursor} = 0; 2164 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2165 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2166 $self->emit ('escape');
1803 } elsif ($uni) { 2167 } elsif ($uni == 0x0d) {
2168 substr $text, $self->{cursor}++, 0, "\012";
2169 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2170 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2171 } else {
1806 return 0; 2172 return 0;
1807 } 2173 }
1808 2174
1809 $self->_set_text ($text); 2175 $self->_set_text ($text);
1810 2176
1811 $self->realloc; 2177 $self->realloc;
2178 $self->update;
1812 2179
1813 1 2180 1
1814} 2181}
1815 2182
1816sub invoke_focus_in { 2183sub invoke_focus_in {
… …
1828 2195
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2196 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2197
1831 # byte-index to char-index 2198 # byte-index to char-index
1832 my $text = $self->{text}; 2199 my $text = $self->{text};
1833 utf8::encode $text; 2200 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2201 $self->{cursor} = length $text;
1835 2202
1836 $self->_set_text ($self->{text}); 2203 $self->_set_text ($self->{text});
1837 $self->update; 2204 $self->update;
1838 2205
1839 1 2206 1
… …
1878 utf8::encode $text; 2245 utf8::encode $text;
1879 2246
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2247 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2248 }
1882 2249
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2250 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2251 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2252 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2253 glEnd;
1888 } 2254 }
1889} 2255}
1890 2256
2257#############################################################################
2258
1891package CFClient::UI::Entry; 2259package CFPlus::UI::Entry;
1892 2260
1893our @ISA = CFClient::UI::EntryBase::; 2261our @ISA = CFPlus::UI::EntryBase::;
1894 2262
1895use CFClient::OpenGL; 2263use CFPlus::OpenGL;
1896 2264
1897sub invoke_key_down { 2265sub invoke_key_down {
1898 my ($self, $ev) = @_; 2266 my ($self, $ev) = @_;
1899 2267
1900 my $sym = $ev->{sym}; 2268 my $sym = $ev->{sym};
1901 2269
1902 if ($sym == 13) { 2270 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2271 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2272 my $txt = $self->get_text;
1905 2273
1906 $self->{history_pointer} = -1; 2274 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2275 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2276 $self->emit (activate => $txt);
1909 $self->update; 2277 $self->update;
1910 2278
1911 } elsif ($sym == CFClient::SDLK_UP) { 2279 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2280 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2281 $self->{history_saveback} = $self->get_text;
1914 } 2282 }
1915 if (@{$self->{history} || []} > 0) { 2283 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2284 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2286 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2287 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2288 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2289 }
1922 2290
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2291 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2292 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2293 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2294
1927 if ($self->{history_pointer} >= 0) { 2295 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2296 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2305 1
1938} 2306}
1939 2307
1940############################################################################# 2308#############################################################################
1941 2309
2310package CFPlus::UI::TextEdit;
2311
2312our @ISA = CFPlus::UI::EntryBase::;
2313
2314use CFPlus::OpenGL;
2315
2316sub move_cursor_ver {
2317 my ($self, $dy) = @_;
2318
2319 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2320
2321 $y += $dy;
2322
2323 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2324 $self->{cursor} = $index;
2325 delete $self->{cur_h};
2326 $self->update;
2327 return;
2328 }
2329}
2330
2331sub invoke_key_down {
2332 my ($self, $ev) = @_;
2333
2334 my $sym = $ev->{sym};
2335
2336 if ($sym == CFPlus::SDLK_UP) {
2337 $self->move_cursor_ver (-1);
2338 } elsif ($sym == CFPlus::SDLK_DOWN) {
2339 $self->move_cursor_ver (+1);
2340 } else {
2341 return $self->SUPER::invoke_key_down ($ev)
2342 }
2343
2344 1
2345}
2346
2347#############################################################################
2348
1942package CFClient::UI::Button; 2349package CFPlus::UI::Button;
1943 2350
1944our @ISA = CFClient::UI::Label::; 2351our @ISA = CFPlus::UI::Label::;
1945 2352
1946use CFClient::OpenGL; 2353use CFPlus::OpenGL;
1947 2354
1948my @tex = 2355my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2356 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2357 qw(b1_button_inactive.png b1_button_active.png);
1951 2358
1952sub new { 2359sub new {
1953 my $class = shift; 2360 my $class = shift;
1954 2361
1955 $class->SUPER::new ( 2362 $class->SUPER::new (
1956 padding_x => 4, 2363 padding_x => 4,
1957 padding_y => 4, 2364 padding_y => 4,
1958 fg => [1, 1, 1], 2365 fg => [1.0, 1.0, 1.0],
1959 active_fg => [0, 0, 1], 2366 active_fg => [0.8, 0.8, 0.8],
1960 can_hover => 1, 2367 can_hover => 1,
1961 align => 0, 2368 align => 0,
1962 valign => 0, 2369 valign => 0,
1963 can_events => 1, 2370 can_events => 1,
1964 @_ 2371 @_
… …
1982 2389
1983 glEnable GL_TEXTURE_2D; 2390 glEnable GL_TEXTURE_2D;
1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985 glColor 0, 0, 0, 1; 2392 glColor 0, 0, 0, 1;
1986 2393
2394 my $tex = $tex[$GRAB == $self];
1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988 2396
1989 glDisable GL_TEXTURE_2D; 2397 glDisable GL_TEXTURE_2D;
1990 2398
1991 $self->SUPER::_draw; 2399 $self->SUPER::_draw;
1992} 2400}
1993 2401
1994############################################################################# 2402#############################################################################
1995 2403
2404package CFPlus::UI::CheckBox;
2405
2406our @ISA = CFPlus::UI::DrawBG::;
2407
2408my @tex =
2409 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2410 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2411
2412use CFPlus::OpenGL;
2413
2414sub new {
2415 my $class = shift;
2416
2417 $class->SUPER::new (
2418 padding_x => 2,
2419 padding_y => 2,
2420 fg => [1, 1, 1],
2421 active_fg => [1, 1, 0],
2422 bg => [0, 0, 0, 0.2],
2423 active_bg => [1, 1, 1, 0.5],
2424 state => 0,
2425 can_hover => 1,
2426 @_
2427 )
2428}
2429
2430sub size_request {
2431 my ($self) = @_;
2432
2433 (6) x 2
2434}
2435
2436sub toggle {
2437 my ($self) = @_;
2438
2439 $self->{state} = !$self->{state};
2440 $self->emit (changed => $self->{state});
2441 $self->update;
2442}
2443
2444sub invoke_button_down {
2445 my ($self, $ev, $x, $y) = @_;
2446
2447 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2448 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2449 $self->toggle;
2450 } else {
2451 return 0
2452 }
2453
2454 1
2455}
2456
2457sub _draw {
2458 my ($self) = @_;
2459
2460 $self->SUPER::_draw;
2461
2462 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2463
2464 my ($w, $h) = @$self{qw(w h)};
2465
2466 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2467
2468 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2469
2470 my $tex = $self->{state} ? $tex[1] : $tex[0];
2471
2472 glEnable GL_TEXTURE_2D;
2473 $tex->draw_quad_alpha (0, 0, $s, $s);
2474 glDisable GL_TEXTURE_2D;
2475}
2476
2477#############################################################################
2478
2479package CFPlus::UI::Image;
2480
2481our @ISA = CFPlus::UI::Base::;
2482
2483use CFPlus::OpenGL;
2484
2485our %texture_cache;
2486
2487sub new {
2488 my $class = shift;
2489
2490 my $self = $class->SUPER::new (
2491 can_events => 0,
2492 @_,
2493 );
2494
2495 $self->{path} || $self->{tex}
2496 or Carp::croak "'path' or 'tex' attributes required";
2497
2498 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2499 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2500
2501 CFPlus::weaken $texture_cache{$self->{path}};
2502
2503 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2504
2505 $self
2506}
2507
2508sub STORABLE_freeze {
2509 my ($self, $cloning) = @_;
2510
2511 $self->{path}
2512 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2513
2514 $self->{path}
2515}
2516
2517sub STORABLE_attach {
2518 my ($self, $cloning, $path) = @_;
2519
2520 $self->new (path => $path)
2521}
2522
2523sub size_request {
2524 my ($self) = @_;
2525
2526 ($self->{tex}{w}, $self->{tex}{h})
2527}
2528
2529sub _draw {
2530 my ($self) = @_;
2531
2532 my $tex = $self->{tex};
2533
2534 my ($w, $h) = ($self->{w}, $self->{h});
2535
2536 if ($self->{rot90}) {
2537 glRotate 90, 0, 0, 1;
2538 glTranslate 0, -$self->{w}, 0;
2539
2540 ($w, $h) = ($h, $w);
2541 }
2542
2543 glEnable GL_TEXTURE_2D;
2544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2545
2546 $tex->draw_quad (0, 0, $w, $h);
2547
2548 glDisable GL_TEXTURE_2D;
2549}
2550
2551#############################################################################
2552
1996package CFClient::UI::ImageButton; 2553package CFPlus::UI::ImageButton;
1997 2554
1998our @ISA = CFClient::UI::Image::; 2555our @ISA = CFPlus::UI::Image::;
1999 2556
2000use CFClient::OpenGL; 2557use CFPlus::OpenGL;
2001 2558
2002my %textures; 2559my %textures;
2003 2560
2004sub new { 2561sub new {
2005 my $class = shift; 2562 my $class = shift;
… …
2027 1 2584 1
2028} 2585}
2029 2586
2030############################################################################# 2587#############################################################################
2031 2588
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_;
2066
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state};
2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
2075 1
2076}
2077
2078sub _draw {
2079 my ($self) = @_;
2080
2081 $self->SUPER::_draw;
2082
2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093 glEnable GL_TEXTURE_2D;
2094 $tex->draw_quad_alpha (0, 0, $s, $s);
2095 glDisable GL_TEXTURE_2D;
2096}
2097
2098#############################################################################
2099
2100package CFClient::UI::Image; 2589package CFPlus::UI::VGauge;
2101 2590
2102our @ISA = CFClient::UI::Base::; 2591our @ISA = CFPlus::UI::Base::;
2103
2104use CFClient::OpenGL;
2105
2106our %texture_cache;
2107
2108sub new {
2109 my $class = shift;
2110
2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2115
2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2118
2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126 $self
2127}
2128
2129sub size_request {
2130 my ($self) = @_;
2131
2132 ($self->{tex}{w}, $self->{tex}{h})
2133}
2134
2135sub _draw {
2136 my ($self) = @_;
2137
2138 my $tex = $self->{tex};
2139
2140 my ($w, $h) = ($self->{w}, $self->{h});
2141
2142 if ($self->{rot90}) {
2143 glRotate 90, 0, 0, 1;
2144 glTranslate 0, -$self->{w}, 0;
2145
2146 ($w, $h) = ($h, $w);
2147 }
2148
2149 glEnable GL_TEXTURE_2D;
2150 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152 $tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154 glDisable GL_TEXTURE_2D;
2155}
2156
2157#############################################################################
2158
2159package CFClient::UI::VGauge;
2160
2161our @ISA = CFClient::UI::Base::;
2162 2592
2163use List::Util qw(min max); 2593use List::Util qw(min max);
2164 2594
2165use CFClient::OpenGL; 2595use CFPlus::OpenGL;
2166 2596
2167my %tex = ( 2597my %tex = (
2168 food => [ 2598 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2599 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2600 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2601 ],
2172 grace => [ 2602 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2603 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2604 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2605 ],
2176 hp => [ 2606 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2607 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2608 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2609 ],
2180 mana => [ 2610 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2611 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2612 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2613 ],
2184); 2614);
2185 2615
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2616# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2676 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2677 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2678
2249 my $h1 = $self->{h} * (1 - $ycut1); 2679 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2680 my $h2 = $self->{h} * (1 - $ycut2);
2681 my $h3 = $self->{h};
2682
2683 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2684
2252 glEnable GL_BLEND; 2685 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2686 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2687 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2688 glEnable GL_TEXTURE_2D;
… …
2274 2707
2275 if ($t3) { 2708 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2709 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2710 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2711 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2712 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2713 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2714 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2715 glEnd;
2283 } 2716 }
2284 2717
2285 glDisable GL_BLEND; 2718 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2719 glDisable GL_TEXTURE_2D;
2287} 2720}
2288 2721
2289############################################################################# 2722#############################################################################
2290 2723
2291package CFClient::UI::Gauge; 2724package CFPlus::UI::Gauge;
2292 2725
2293our @ISA = CFClient::UI::VBox::; 2726our @ISA = CFPlus::UI::VBox::;
2294 2727
2295sub new { 2728sub new {
2296 my ($class, %arg) = @_; 2729 my ($class, %arg) = @_;
2297 2730
2298 my $self = $class->SUPER::new ( 2731 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2733 can_hover => 1,
2301 can_events => 1, 2734 can_events => 1,
2302 %arg, 2735 %arg,
2303 ); 2736 );
2304 2737
2305 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2738 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2739 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2740 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308 2741
2309 $self 2742 $self
2310} 2743}
2311 2744
2312sub set_fontsize { 2745sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2766 $self->{value}->set_text ($val);
2334} 2767}
2335 2768
2336############################################################################# 2769#############################################################################
2337 2770
2338package CFClient::UI::Slider; 2771package CFPlus::UI::Slider;
2339 2772
2340use strict; 2773use strict;
2341 2774
2342use CFClient::OpenGL; 2775use CFPlus::OpenGL;
2343 2776
2344our @ISA = CFClient::UI::DrawBG::; 2777our @ISA = CFPlus::UI::DrawBG::;
2345 2778
2346my @tex = 2779my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2780 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2781 qw(s1_slider.png s1_slider_bg.png);
2349 2782
2350sub new { 2783sub new {
2351 my $class = shift; 2784 my $class = shift;
2352 2785
… …
2420 2853
2421 $self->SUPER::invoke_button_down ($ev, $x, $y); 2854 $self->SUPER::invoke_button_down ($ev, $x, $y);
2422 2855
2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2856 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2424 2857
2425 $self->invoke_mouse_motion ($ev, $x, $y) 2858 $self->invoke_mouse_motion ($ev, $x, $y);
2859
2860 1
2426} 2861}
2427 2862
2428sub invoke_mouse_motion { 2863sub invoke_mouse_motion {
2429 my ($self, $ev, $x, $y) = @_; 2864 my ($self, $ev, $x, $y) = @_;
2430 2865
… …
2437 2872
2438 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2873 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439 } else { 2874 } else {
2440 return 0; 2875 return 0;
2441 } 2876 }
2877
2878 1
2879}
2880
2881sub invoke_mouse_wheel {
2882 my ($self, $ev) = @_;
2883
2884 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2885
2886 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2887
2888 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2442 2889
2443 1 2890 1
2444} 2891}
2445 2892
2446sub update { 2893sub update {
… …
2497 glDisable GL_TEXTURE_2D; 2944 glDisable GL_TEXTURE_2D;
2498} 2945}
2499 2946
2500############################################################################# 2947#############################################################################
2501 2948
2502package CFClient::UI::ValSlider; 2949package CFPlus::UI::ValSlider;
2503 2950
2504our @ISA = CFClient::UI::HBox::; 2951our @ISA = CFPlus::UI::HBox::;
2505 2952
2506sub new { 2953sub new {
2507 my ($class, %arg) = @_; 2954 my ($class, %arg) = @_;
2508 2955
2509 my $range = delete $arg{range}; 2956 my $range = delete $arg{range};
2510 2957
2511 my $self = $class->SUPER::new ( 2958 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2959 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2960 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 2961 to_value => sub { shift },
2515 from_value => sub { shift }, 2962 from_value => sub { shift },
2516 %arg, 2963 %arg,
2517 ); 2964 );
2518 2965
… …
2538sub set_range { shift->{slider}->set_range (@_) } 2985sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 2986sub set_value { shift->{slider}->set_value (@_) }
2540 2987
2541############################################################################# 2988#############################################################################
2542 2989
2543package CFClient::UI::TextScroller; 2990package CFPlus::UI::TextScroller;
2544 2991
2545our @ISA = CFClient::UI::HBox::; 2992our @ISA = CFPlus::UI::HBox::;
2546 2993
2547use CFClient::OpenGL; 2994use CFPlus::OpenGL;
2548 2995
2549sub new { 2996sub new {
2550 my $class = shift; 2997 my $class = shift;
2551 2998
2552 my $self = $class->SUPER::new ( 2999 my $self = $class->SUPER::new (
2553 fontsize => 1, 3000 fontsize => 1,
2554 can_events => 0, 3001 can_events => 1,
2555 indent => 0, 3002 indent => 0,
2556 #font => default_font 3003 #font => default_font
2557 @_, 3004 @_,
2558 3005
2559 layout => (new CFClient::Layout 1), 3006 layout => (new CFPlus::Layout),
2560 par => [], 3007 par => [],
3008 max_par => 0,
2561 height => 0, 3009 height => 0,
2562 children => [ 3010 children => [
2563 (new CFClient::UI::Empty expand => 1), 3011 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 3012 (new CFPlus::UI::Slider vertical => 1),
2565 ], 3013 ],
2566 ); 3014 );
2567 3015
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 3016 $self->{children}[1]->connect (changed => sub { $self->update });
2569 3017
… …
2575 3023
2576 $self->{fontsize} = $fontsize; 3024 $self->{fontsize} = $fontsize;
2577 $self->reflow; 3025 $self->reflow;
2578} 3026}
2579 3027
2580sub visible_children { 3028sub size_request {
2581 my ($self) = @_; 3029 my ($self) = @_;
2582 3030
2583 @{$self->{children}}[0,1] 3031 my ($empty, $slider) = $self->visible_children;
3032
3033 local $self->{children} = [$empty, $slider];
3034 $self->SUPER::size_request
2584} 3035}
2585 3036
2586sub invoke_size_allocate { 3037sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 3038 my ($self, $w, $h) = @_;
2588 3039
… …
2594 $self->{layout}->set_width ($empty->{w}); 3045 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3046 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 3047
2597 $self->reflow; 3048 $self->reflow;
2598 3049
3050 local $self->{children} = [$empty, $slider];
2599 $self->SUPER::invoke_size_allocate ($w, $h) 3051 $self->SUPER::invoke_size_allocate ($w, $h)
3052}
3053
3054sub invoke_mouse_wheel {
3055 my ($self, $ev) = @_;
3056
3057 return 0 unless $ev->{dy}; # only vertical movements
3058
3059 $self->{children}[1]->emit (mouse_wheel => $ev);
3060
3061 1
2600} 3062}
2601 3063
2602sub get_layout { 3064sub get_layout {
2603 my ($self, $para) = @_; 3065 my ($self, $para) = @_;
2604 3066
… …
2632 3094
2633 # todo: base offset on lines or so, not on pixels 3095 # todo: base offset on lines or so, not on pixels
2634 $self->{children}[1]->set_value ($offset); 3096 $self->{children}[1]->set_value ($offset);
2635} 3097}
2636 3098
3099sub current_paragraph {
3100 my ($self) = @_;
3101
3102 $self->{top_paragraph} - 1
3103}
3104
3105sub scroll_to {
3106 my ($self, $para) = @_;
3107
3108 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3109
3110 $self->{scroll_to} = $para;
3111 $self->update;
3112}
3113
2637sub clear { 3114sub clear {
2638 my ($self) = @_; 3115 my ($self) = @_;
2639 3116
2640 my (undef, undef, @other) = @{ $self->{children} }; 3117 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other; 3118 $self->remove ($_) for @other;
… …
2644 $self->{height} = 0; 3121 $self->{height} = 0;
2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3122 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646} 3123}
2647 3124
2648sub add_paragraph { 3125sub add_paragraph {
2649 my ($self, $color, $para, $indent) = @_; 3126 my $self = shift;
2650 3127
2651 my ($text, @w) = ref $para ? @$para : $para; 3128 for my $para (@_) {
2652
2653 $para = { 3129 $para = {
3130 fg => [1, 1, 1, 1],
3131 indent => 0,
3132 markup => "",
3133 widget => [],
3134 ref $para ? %$para : (markup => $para),
2654 w => 1e10, 3135 w => 1e10,
2655 wrapped => 1, 3136 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2660 }; 3137 };
2661 3138
2662 $self->add (@w) if @w; 3139 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663 push @{$self->{par}}, $para; 3140 push @{$self->{par}}, $para;
3141 }
3142
3143 if (my $max = $self->{max_par}) {
3144 shift @{$self->{par}} while @{$self->{par}} > $max;
3145 }
2664 3146
2665 $self->{need_reflow}++; 3147 $self->{need_reflow}++;
2666 $self->update; 3148 $self->update;
2667} 3149}
2668 3150
2669sub scroll_to_bottom { 3151sub scroll_to_bottom {
2670 my ($self) = @_; 3152 my ($self) = @_;
2671 3153
2672 $self->{scroll_to_bottom} = 1; 3154 $self->{scroll_to} = $#{$self->{par}};
2673 $self->update; 3155 $self->update;
2674} 3156}
2675 3157
3158sub force_uptodate {
3159 my ($self) = @_;
3160
3161 if (delete $self->{need_reflow}) {
3162 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3163
3164 my $height = 0;
3165
3166 for my $para (@{$self->{par}}) {
3167 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3168 my $layout = $self->get_layout ($para);
3169 my ($w, $h) = $layout->size;
3170
3171 $para->{w} = $w + $para->{indent};
3172 $para->{h} = $h;
3173 $para->{wrapped} = $layout->has_wrapped;
3174 }
3175
3176 $para->{y} = $height;
3177 $height += $para->{h};
3178 }
3179
3180 $self->{height} = $height;
3181 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3182
3183 delete $self->{texture};
3184 }
3185
3186 if (my $paridx = delete $self->{scroll_to}) {
3187 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3188 }
3189}
3190
2676sub update { 3191sub update {
2677 my ($self) = @_; 3192 my ($self) = @_;
2678 3193
2679 $self->SUPER::update; 3194 $self->SUPER::update;
2680 3195
2681 return unless $self->{h} > 0; 3196 return unless $self->{h} > 0;
2682 3197
2683 delete $self->{texture}; 3198 delete $self->{texture};
2684 3199
2685 $ROOT->on_post_alloc ($self => sub { 3200 $ROOT->on_post_alloc ($self => sub {
3201 $self->force_uptodate;
3202
2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3203 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687 3204
2688 if (delete $self->{need_reflow}) {
2689 my $height = 0;
2690
2691 for my $para (@{$self->{par}}) {
2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2693 my $layout = $self->get_layout ($para);
2694 my ($w, $h) = $layout->size;
2695
2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2699 }
2700
2701 $height += $para->{h};
2702 }
2703
2704 $self->{height} = $height;
2705
2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2707
2708 delete $self->{texture};
2709 }
2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3205 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716 glClearColor 0, 0, 0, 0; 3206 glClearColor 0, 0, 0, 0;
2717 glClear GL_COLOR_BUFFER_BIT; 3207 glClear GL_COLOR_BUFFER_BIT;
2718 3208
3209 package CFPlus::UI::Base;
3210 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3211 (0, 0, $self->{w}, $self->{h});
3212
3213 my $top = int $self->{children}[1]{range}[0];
3214
3215 my $paridx = 0;
3216 my $top_paragraph;
2719 my $top = int $self->{children}[1]{range}[0]; 3217 my $top = int $self->{children}[1]{range}[0];
2720 3218
2721 my $y0 = $top; 3219 my $y0 = $top;
2722 my $y1 = $top + $H; 3220 my $y1 = $top + $H;
2723 3221
2724 my $y = 0;
2725
2726 glEnable GL_BLEND;
2727 #TODO# not correct in windows where rgba is forced off
2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730 for my $para (@{$self->{par}}) { 3222 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 3223 my $h = $para->{h};
3224 my $y = $para->{y};
2732 3225
2733 if ($y0 < $y + $h && $y < $y1) { 3226 if ($y0 < $y + $h && $y < $y1) {
2734
2735 my $layout = $self->get_layout ($para); 3227 my $layout = $self->get_layout ($para);
2736 3228
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 3229 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741 3230
2742 if (my @w = @{ $para->{widget} }) { 3231 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 3232 my @s = $layout->get_shapes;
2744 3233
2745 for (@w) { 3234 for (@w) {
… …
2751 $_->draw; 3240 $_->draw;
2752 } 3241 }
2753 } 3242 }
2754 } 3243 }
2755 3244
2756 $y += $h; 3245 $paridx++;
3246 $top_paragraph ||= $paridx if $y >= $top;
2757 } 3247 }
2758 3248
2759 glDisable GL_BLEND; 3249 $self->{top_paragraph} = $top_paragraph;
2760 }; 3250 };
2761 }); 3251 });
2762} 3252}
2763 3253
2764sub reconfigure { 3254sub reconfigure {
… …
2782 $self->{children}[1]->draw; 3272 $self->{children}[1]->draw;
2783} 3273}
2784 3274
2785############################################################################# 3275#############################################################################
2786 3276
2787package CFClient::UI::Animator; 3277package CFPlus::UI::Animator;
2788 3278
2789use CFClient::OpenGL; 3279use CFPlus::OpenGL;
2790 3280
2791our @ISA = CFClient::UI::Bin::; 3281our @ISA = CFPlus::UI::Bin::;
2792 3282
2793sub moveto { 3283sub moveto {
2794 my ($self, $x, $y) = @_; 3284 my ($self, $x, $y) = @_;
2795 3285
2796 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3286 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2824 glPopMatrix; 3314 glPopMatrix;
2825} 3315}
2826 3316
2827############################################################################# 3317#############################################################################
2828 3318
2829package CFClient::UI::Flopper; 3319package CFPlus::UI::Flopper;
2830 3320
2831our @ISA = CFClient::UI::Button::; 3321our @ISA = CFPlus::UI::Button::;
2832 3322
2833sub new { 3323sub new {
2834 my $class = shift; 3324 my $class = shift;
2835 3325
2836 my $self = $class->SUPER::new ( 3326 my $self = $class->SUPER::new (
… …
2848 $self->{other}->toggle_visibility; 3338 $self->{other}->toggle_visibility;
2849} 3339}
2850 3340
2851############################################################################# 3341#############################################################################
2852 3342
2853package CFClient::UI::Tooltip; 3343package CFPlus::UI::Tooltip;
2854 3344
2855our @ISA = CFClient::UI::Bin::; 3345our @ISA = CFPlus::UI::Bin::;
2856 3346
2857use CFClient::OpenGL; 3347use CFPlus::OpenGL;
2858 3348
2859sub new { 3349sub new {
2860 my $class = shift; 3350 my $class = shift;
2861 3351
2862 $class->SUPER::new ( 3352 $class->SUPER::new (
… …
2865 ) 3355 )
2866} 3356}
2867 3357
2868sub set_tooltip_from { 3358sub set_tooltip_from {
2869 my ($self, $widget) = @_; 3359 my ($self, $widget) = @_;
3360
3361 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3362 if $widget->{tooltip} =~ /^#(.*)$/;
2870 3363
2871 my $tooltip = $widget->{tooltip}; 3364 my $tooltip = $widget->{tooltip};
2872 3365
2873 if ($ENV{CFPLUS_DEBUG} & 2) { 3366 if ($ENV{CFPLUS_DEBUG} & 2) {
2874 $tooltip .= "\n\n" . (ref $widget) . "\n" 3367 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2878 } 3371 }
2879 3372
2880 $tooltip =~ s/^\n+//; 3373 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//; 3374 $tooltip =~ s/\n+$//;
2882 3375
2883 $self->add (new CFClient::UI::Label 3376 $self->add (new CFPlus::UI::Label
2884 markup => $tooltip, 3377 markup => $tooltip,
2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3378 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886 fontsize => 0.8, 3379 fontsize => 0.8,
2887 fg => [0, 0, 0, 1], 3380 style => 1, # FLAG_INVERSE
2888 ellipsise => 0, 3381 ellipsise => 0,
2889 font => ($widget->{tooltip_font} || $::FONT_PROP), 3382 font => ($widget->{tooltip_font} || $::FONT_PROP),
2890 ); 3383 );
2891} 3384}
2892 3385
… …
2911 3404
2912 $self->{root}->on_post_alloc ("move_$self" => sub { 3405 $self->{root}->on_post_alloc ("move_$self" => sub {
2913 my $widget = $self->{owner} 3406 my $widget = $self->{owner}
2914 or return; 3407 or return;
2915 3408
3409 if ($widget->{visible}) {
2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3410 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917 3411
2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3412 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919 if $x + $self->{w} > $self->{root}{w}; 3413 if $x + $self->{w} > $self->{root}{w};
2920 3414
2921 $self->move_abs ($x, $y); 3415 $self->move_abs ($x, $y);
3416 } else {
3417 $self->hide;
3418 }
2922 }); 3419 });
2923} 3420}
2924 3421
2925sub _draw { 3422sub _draw {
2926 my ($self) = @_; 3423 my ($self) = @_;
… …
2950 $self->SUPER::_draw; 3447 $self->SUPER::_draw;
2951} 3448}
2952 3449
2953############################################################################# 3450#############################################################################
2954 3451
2955package CFClient::UI::Face; 3452package CFPlus::UI::Face;
2956 3453
2957our @ISA = CFClient::UI::Base::; 3454our @ISA = CFPlus::UI::DrawBG::;
2958 3455
2959use CFClient::OpenGL; 3456use CFPlus::OpenGL;
2960 3457
2961sub new { 3458sub new {
2962 my $class = shift; 3459 my $class = shift;
2963 3460
2964 my $self = $class->SUPER::new ( 3461 my $self = $class->SUPER::new (
3462 size_w => 32,
3463 size_h => 8,
2965 aspect => 1, 3464 aspect => 1,
2966 can_events => 0, 3465 can_events => 0,
2967 @_, 3466 @_,
2968 ); 3467 );
2969 3468
2970 if ($self->{anim} && $self->{animspeed}) { 3469 if ($self->{anim} && $self->{animspeed}) {
2971 Scalar::Util::weaken (my $widget = $self); 3470 CFPlus::weaken (my $widget = $self);
2972 3471
3472 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3473 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2973 $self->{timer} = Event->timer ( 3474 $self->{timer} = Event->timer (
2974 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975 hard => 1, 3475 parked => 1,
2976 interval => $self->{animspeed},
2977 cb => sub { 3476 cb => sub {
3477 return unless $::CONN && $widget;
3478
2978 ++$widget->{frame}; 3479 ++$widget->{frame};
3480 $widget->update_face;
2979 $widget->update; 3481 $widget->update;
3482
3483 $widget->update_timer;
2980 }, 3484 },
2981 ); 3485 );
3486
3487 $self->update_face;
3488 $self->update_timer;
2982 } 3489 }
2983 3490
2984 $self 3491 $self
2985} 3492}
2986 3493
3494sub update_timer {
3495 my ($self) = @_;
3496
3497 return unless $self->{timer};
3498
3499 if ($self->{visible}) {
3500 $self->{timer}->at (
3501 $self->{anim_start}
3502 + $self->{animspeed}
3503 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3504 );
3505 $self->{timer}->start;
3506 } else {
3507 $self->{timer}->stop;
3508 }
3509}
3510
3511sub update_face {
3512 my ($self) = @_;
3513
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3521 }
3522 }
3523}
3524
2987sub size_request { 3525sub size_request {
2988 (32, 8) 3526 my ($self) = @_;
3527
3528 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 $self->{tex} = $tex;
3532 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3533 } else {
3534 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3535 $self->realloc;
3536 });
3537 }
3538 }
3539 }
3540
3541 ($self->{size_w} || 8, $self->{size_h} || 8)
2989} 3542}
2990 3543
2991sub update { 3544sub update {
2992 my ($self) = @_; 3545 my ($self) = @_;
2993 3546
2994 return unless $self->{visible}; 3547 return unless $self->{visible};
2995 3548
2996 $self->SUPER::update; 3549 $self->SUPER::update;
2997} 3550}
2998 3551
3552sub invoke_visibility_change {
3553 my ($self) = @_;
3554
3555 $self->update_timer;
3556
3557 0
3558}
3559
2999sub _draw { 3560sub _draw {
3000 my ($self) = @_; 3561 my ($self) = @_;
3001 3562
3002 return unless $::CONN; 3563 $self->SUPER::_draw;
3003 3564
3004 my $face; 3565 if (my $tex = $self->{tex}) {
3005
3006 if ($self->{frame}) {
3007 my $anim = $::CONN->{anim}[$self->{anim}];
3008
3009 $face = $anim->[ $self->{frame} % @$anim ]
3010 if $anim && @$anim;
3011 }
3012
3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3014
3015 if ($tex) {
3016 glEnable GL_TEXTURE_2D; 3566 glEnable GL_TEXTURE_2D;
3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3018 glColor 0, 0, 0, 1; 3568 glColor 0, 0, 0, 1;
3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3569 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3020 glDisable GL_TEXTURE_2D; 3570 glDisable GL_TEXTURE_2D;
… …
3022} 3572}
3023 3573
3024sub destroy { 3574sub destroy {
3025 my ($self) = @_; 3575 my ($self) = @_;
3026 3576
3027 $self->{timer}->cancel 3577 (delete $self->{timer})->cancel
3028 if $self->{timer}; 3578 if $self->{timer};
3029 3579
3030 $self->SUPER::destroy; 3580 $self->SUPER::destroy;
3031} 3581}
3032 3582
3033############################################################################# 3583#############################################################################
3034 3584
3035package CFClient::UI::Buttonbar; 3585package CFPlus::UI::Buttonbar;
3036 3586
3037our @ISA = CFClient::UI::HBox::; 3587our @ISA = CFPlus::UI::HBox::;
3038 3588
3039# TODO: should actualyl wrap buttons and other goodies. 3589# TODO: should actually wrap buttons and other goodies.
3040 3590
3041############################################################################# 3591#############################################################################
3042 3592
3043package CFClient::UI::Menu; 3593package CFPlus::UI::Menu;
3044 3594
3045our @ISA = CFClient::UI::FancyFrame::; 3595our @ISA = CFPlus::UI::Toplevel::;
3046 3596
3047use CFClient::OpenGL; 3597use CFPlus::OpenGL;
3048 3598
3049sub new { 3599sub new {
3050 my $class = shift; 3600 my $class = shift;
3051 3601
3052 my $self = $class->SUPER::new ( 3602 my $self = $class->SUPER::new (
3053 items => [], 3603 items => [],
3054 z => 100, 3604 z => 100,
3055 @_, 3605 @_,
3056 ); 3606 );
3057 3607
3058 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3608 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059 3609
3060 for my $item (@{ $self->{items} }) { 3610 for my $item (@{ $self->{items} }) {
3061 my ($widget, $cb, $tooltip) = @$item; 3611 my ($widget, $cb, $tooltip) = @$item;
3062 3612
3063 # handle various types of items, only text for now 3613 # handle various types of items, only text for now
3064 if (!ref $widget) { 3614 if (!ref $widget) {
3615 if ($widget =~ /\t/) {
3616 my ($left, $right) = split /\t/, $widget, 2;
3617
3065 $widget = new CFClient::UI::Label 3618 $widget = new CFPlus::UI::HBox
3066 can_hover => 1, 3619 can_hover => 1,
3067 can_events => 1, 3620 can_events => 1,
3621 tooltip => $tooltip,
3622 children => [
3623 (new CFPlus::UI::Label markup => $left, expand => 1),
3624 (new CFPlus::UI::Label markup => $right, align => +1),
3625 ],
3626 ;
3627
3628 } else {
3629 $widget = new CFPlus::UI::Label
3630 can_hover => 1,
3631 can_events => 1,
3068 markup => $widget, 3632 markup => $widget,
3069 tooltip => $tooltip 3633 tooltip => $tooltip;
3634 }
3070 } 3635 }
3071 3636
3072 $self->{item}{$widget} = $item; 3637 $self->{item}{$widget} = $item;
3073 3638
3074 $self->{vbox}->add ($widget); 3639 $self->{vbox}->add ($widget);
… …
3117 1 3682 1
3118} 3683}
3119 3684
3120############################################################################# 3685#############################################################################
3121 3686
3122package CFClient::UI::Multiplexer; 3687package CFPlus::UI::Multiplexer;
3123 3688
3124our @ISA = CFClient::UI::Container::; 3689our @ISA = CFPlus::UI::Container::;
3125 3690
3126sub new { 3691sub new {
3127 my $class = shift; 3692 my $class = shift;
3128 3693
3129 my $self = $class->SUPER::new ( 3694 my $self = $class->SUPER::new (
… …
3143 3708
3144 $self->{current} = $self->{children}[0] 3709 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3710 if @{ $self->{children} };
3146} 3711}
3147 3712
3713sub get_current_page {
3714 my ($self) = @_;
3715
3716 $self->{current}
3717}
3718
3148sub set_current_page { 3719sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3720 my ($self, $page_or_widget) = @_;
3150 3721
3151 my $widget = ref $page_or_widget 3722 my $widget = ref $page_or_widget
3152 ? $page_or_widget 3723 ? $page_or_widget
… …
3184 $self->{current}->draw; 3755 $self->{current}->draw;
3185} 3756}
3186 3757
3187############################################################################# 3758#############################################################################
3188 3759
3189package CFClient::UI::Notebook; 3760package CFPlus::UI::Notebook;
3190 3761
3191our @ISA = CFClient::UI::VBox::; 3762our @ISA = CFPlus::UI::VBox::;
3192 3763
3193sub new { 3764sub new {
3194 my $class = shift; 3765 my $class = shift;
3195 3766
3196 my $self = $class->SUPER::new ( 3767 my $self = $class->SUPER::new (
3197 buttonbar => (new CFClient::UI::Buttonbar), 3768 buttonbar => (new CFPlus::UI::Buttonbar),
3198 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3769 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199 # filter => # will be put between multiplexer and $self 3770 # filter => # will be put between multiplexer and $self
3200 @_, 3771 @_,
3201 ); 3772 );
3202 3773
3203 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3774 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3204 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3775 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3205 3776
3777 {
3778 Scalar::Util::weaken (my $wself = $self);
3779
3780 $self->{multiplexer}->connect (c_add => sub {
3781 my ($mplex, $widgets) = @_;
3782
3783 for my $child (@$widgets) {
3784 Scalar::Util::weaken $child;
3785 $child->{c_tab_} ||= do {
3786 my $tab =
3787 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3788 ? $child->{c_tab}
3789 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3790
3791 $tab->connect (activate => sub {
3792 $wself->set_current_page ($child);
3793 });
3794
3795 $tab
3796 };
3797
3798 $self->{buttonbar}->add ($child->{c_tab_});
3799 }
3800 });
3801
3802 $self->{multiplexer}->connect (c_remove => sub {
3803 my ($mplex, $widgets) = @_;
3804
3805 for my $child (@$widgets) {
3806 $wself->{buttonbar}->remove ($child->{c_tab_});
3807 }
3808 });
3809 }
3810
3206 $self 3811 $self
3207} 3812}
3208 3813
3209sub add { 3814sub add {
3815 my ($self, @widgets) = @_;
3816
3817 $self->{multiplexer}->add (@widgets)
3818}
3819
3820sub remove {
3821 my ($self, @widgets) = @_;
3822
3823 $self->{multiplexer}->remove (@widgets)
3824}
3825
3826sub add_tab {
3210 my ($self, $title, $widget, $tooltip) = @_; 3827 my ($self, $title, $widget, $tooltip) = @_;
3211 3828
3212 Scalar::Util::weaken $self; 3829 $title = [$title, $tooltip] unless ref $title;
3830 $widget->{c_tab} = $title;
3213 3831
3214 $self->{buttonbar}->add (new CFClient::UI::Button
3215 markup => $title,
3216 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) },
3218 );
3219
3220 $self->{multiplexer}->add ($widget); 3832 $self->add ($widget);
3833}
3834
3835sub get_current_page {
3836 my ($self) = @_;
3837
3838 $self->{multiplexer}->get_current_page
3221} 3839}
3222 3840
3223sub set_current_page { 3841sub set_current_page {
3224 my ($self, $page) = @_; 3842 my ($self, $page) = @_;
3225 3843
… …
3227 $self->emit (page_changed => $self->{multiplexer}{current}); 3845 $self->emit (page_changed => $self->{multiplexer}{current});
3228} 3846}
3229 3847
3230############################################################################# 3848#############################################################################
3231 3849
3232package CFClient::UI::Combobox; 3850package CFPlus::UI::Selector;
3233 3851
3234use utf8; 3852use utf8;
3235 3853
3236our @ISA = CFClient::UI::Button::; 3854our @ISA = CFPlus::UI::Button::;
3237 3855
3238sub new { 3856sub new {
3239 my $class = shift; 3857 my $class = shift;
3240 3858
3241 my $self = $class->SUPER::new ( 3859 my $self = $class->SUPER::new (
… …
3258 my ($value, $title, $tooltip) = @$_; 3876 my ($value, $title, $tooltip) = @$_;
3259 3877
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3878 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 } 3879 }
3262 3880
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3881 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264} 3882}
3265 3883
3266sub _set_value { 3884sub _set_value {
3267 my ($self, $value) = @_; 3885 my ($self, $value) = @_;
3268 3886
… …
3283 $self->emit (changed => $value); 3901 $self->emit (changed => $value);
3284} 3902}
3285 3903
3286############################################################################# 3904#############################################################################
3287 3905
3288package CFClient::UI::Statusbox; 3906package CFPlus::UI::Statusbox;
3289 3907
3290our @ISA = CFClient::UI::VBox::; 3908our @ISA = CFPlus::UI::VBox::;
3291 3909
3292sub new { 3910sub new {
3293 my $class = shift; 3911 my $class = shift;
3294 3912
3295 my $self = $class->SUPER::new ( 3913 my $self = $class->SUPER::new (
3296 fontsize => 0.8, 3914 fontsize => 0.8,
3297 @_, 3915 @_,
3298 ); 3916 );
3299 3917
3300 Scalar::Util::weaken (my $this = $self); 3918 CFPlus::weaken (my $this = $self);
3301 3919
3302 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3920 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303 3921
3304 $self 3922 $self
3305} 3923}
… …
3307sub reorder { 3925sub reorder {
3308 my ($self) = @_; 3926 my ($self) = @_;
3309 my $NOW = Time::HiRes::time; 3927 my $NOW = Time::HiRes::time;
3310 3928
3311 # freeze display when hovering over any label 3929 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner} 3930 return if $CFPlus::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3931 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} }; 3932 values %{ $self->{item} };
3315 3933
3316 while (my ($k, $v) = each %{ $self->{item} }) { 3934 while (my ($k, $v) = each %{ $self->{item} }) {
3317 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3935 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318 } 3936 }
… …
3339 for ($short) { 3957 for ($short) {
3340 s/^\s+//; 3958 s/^\s+//;
3341 s/\s+/ /g; 3959 s/\s+/ /g;
3342 } 3960 }
3343 3961
3344 new CFClient::UI::Label 3962 new CFPlus::UI::Label
3345 markup => $short, 3963 markup => $short,
3346 tooltip => $item->{tooltip}, 3964 tooltip => $item->{tooltip},
3347 tooltip_font => $::FONT_PROP, 3965 tooltip_font => $::FONT_PROP,
3348 tooltip_width => 0.67, 3966 tooltip_width => 0.67,
3349 fontsize => $item->{fontsize} || $self->{fontsize}, 3967 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3403 count => 1, 4021 count => 1,
3404 %arg, 4022 %arg,
3405 }; 4023 };
3406 } 4024 }
3407 4025
4026 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 4027 $self->reorder;
4028 });
3409} 4029}
3410 4030
3411sub reconfigure { 4031sub reconfigure {
3412 my ($self) = @_; 4032 my ($self) = @_;
3413 4033
… …
3426 $self->SUPER::destroy; 4046 $self->SUPER::destroy;
3427} 4047}
3428 4048
3429############################################################################# 4049#############################################################################
3430 4050
3431package CFClient::UI::Inventory;
3432
3433our @ISA = CFClient::UI::ScrolledWindow::;
3434
3435sub new {
3436 my $class = shift;
3437
3438 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3440 @_,
3441 );
3442
3443 $self
3444}
3445
3446sub set_items {
3447 my ($self, $items) = @_;
3448
3449 $self->{child}->clear;
3450 return unless $items;
3451
3452 my @items = sort {
3453 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name})
3455 } @$items;
3456
3457 $self->{real_items} = \@items;
3458
3459 my $row = 0;
3460 for my $item (@items) {
3461 CFClient::Item::update_widgets $item;
3462
3463 $self->{child}->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget});
3466
3467 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 }
3677}
3678
3679#############################################################################
3680
3681package CFClient::UI::SpellList;
3682
3683our @ISA = CFClient::UI::Table::;
3684
3685sub new {
3686 my $class = shift;
3687
3688 my $self = $class->SUPER::new (
3689 binding => [],
3690 commands => [],
3691 @_,
3692 )
3693}
3694
3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708sub rebuild_spell_list {
3709 my ($self) = @_;
3710
3711 $CFClient::UI::ROOT->on_refresh ($self => sub {
3712 $self->clear;
3713
3714 return unless $::CONN;
3715
3716 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722 my $row = 0;
3723
3724 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725 my $spell = $self->{spell}{$_};
3726
3727 $row++;
3728
3729 my $spell_cb = sub {
3730 my ($widget, $ev) = @_;
3731
3732 if ($ev->{button} == 1) {
3733 $::CONN->user_send ("cast $spell->{name}");
3734 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu
3738 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ],
3742 )->popup ($ev);
3743 } else {
3744 return 0;
3745 }
3746
3747 1
3748 };
3749
3750 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752 #TODO: add path info to tooltip
3753 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755 $self->add (0, $row, new CFClient::UI::Face
3756 face => $spell->{face},
3757 can_hover => 1,
3758 can_events => 1,
3759 tooltip => $tooltip,
3760 on_button_down => $spell_cb,
3761 );
3762
3763 $self->add (1, $row, new CFClient::UI::Label
3764 expand => 1,
3765 text => $spell->{name},
3766 can_hover => 1,
3767 can_events => 1,
3768 tooltip => $tooltip,
3769 on_button_down => $spell_cb,
3770 );
3771
3772 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776 }
3777 });
3778}
3779
3780sub add_spell {
3781 my ($self, $spell) = @_;
3782
3783 $self->{spell}->{$spell->{name}} = $spell;
3784 $self->rebuild_spell_list;
3785}
3786
3787sub remove_spell {
3788 my ($self, $spell) = @_;
3789
3790 delete $self->{spell}->{$spell->{name}};
3791 $self->rebuild_spell_list;
3792}
3793
3794sub clear_spells {
3795 my ($self) = @_;
3796
3797 $self->{spell} = {};
3798 $self->rebuild_spell_list;
3799}
3800
3801#############################################################################
3802
3803package CFClient::UI::Root; 4051package CFPlus::UI::Root;
3804 4052
3805our @ISA = CFClient::UI::Container::; 4053our @ISA = CFPlus::UI::Container::;
3806 4054
3807use List::Util qw(min max); 4055use List::Util qw(min max);
3808 4056
3809use CFClient::OpenGL; 4057use CFPlus::OpenGL;
3810 4058
3811sub new { 4059sub new {
3812 my $class = shift; 4060 my $class = shift;
3813 4061
3814 my $self = $class->SUPER::new ( 4062 my $self = $class->SUPER::new (
3815 visible => 1, 4063 visible => 1,
3816 @_, 4064 @_,
3817 ); 4065 );
3818 4066
3819 Scalar::Util::weaken ($self->{root} = $self); 4067 CFPlus::weaken ($self->{root} = $self);
3820 4068
3821 $self 4069 $self
3822} 4070}
3823 4071
3824sub size_request { 4072sub size_request {
… …
3919 while ($self->{refresh_hook}) { 4167 while ($self->{refresh_hook}) {
3920 $_->() 4168 $_->()
3921 for values %{delete $self->{refresh_hook}}; 4169 for values %{delete $self->{refresh_hook}};
3922 } 4170 }
3923 4171
3924 if ($self->{realloc}) { 4172 while ($self->{realloc}) {
3925 my %queue; 4173 my %queue;
3926 my @queue; 4174 my @queue;
3927 my $widget; 4175 my $widget;
3928 4176
3929 outer: 4177 outer:
… …
3976 } 4224 }
3977 } 4225 }
3978 4226
3979 delete $self->{realloc}{$widget+0}; 4227 delete $self->{realloc}{$widget+0};
3980 } 4228 }
3981 }
3982 4229
3983 while (my $size_alloc = delete $self->{size_alloc}) { 4230 while (my $size_alloc = delete $self->{size_alloc}) {
3984 my @queue = sort { $b->{visible} <=> $a->{visible} } 4231 my @queue = sort { $a->{visible} <=> $b->{visible} }
3985 values %$size_alloc; 4232 values %$size_alloc;
3986 4233
3987 while () { 4234 while () {
3988 my $widget = pop @queue || last; 4235 my $widget = pop @queue || last;
3989 4236
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4237 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991 4238
3992 $w = 0 if $w < 0; 4239 $w = max $widget->{min_w}, $w;
3993 $h = 0 if $h < 0; 4240 $h = max $widget->{min_h}, $h;
3994 4241
4242# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4243# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4244
4245 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4246 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4247
3995 $w = int $w + 0.5; 4248 $w = int $w + 0.5;
3996 $h = int $h + 0.5; 4249 $h = int $h + 0.5;
3997 4250
3998 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4251 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999 $widget->{old_w} = $widget->{w}; 4252 $widget->{old_w} = $widget->{w};
4000 $widget->{old_h} = $widget->{h}; 4253 $widget->{old_h} = $widget->{h};
4001 4254
4002 $widget->{w} = $w; 4255 $widget->{w} = $w;
4003 $widget->{h} = $h; 4256 $widget->{h} = $h;
4004 4257
4005 $widget->emit (size_allocate => $w, $h); 4258 $widget->emit (size_allocate => $w, $h);
4259 }
4006 } 4260 }
4007 } 4261 }
4008 } 4262 }
4009 4263
4010 while ($self->{post_alloc_hook}) { 4264 while ($self->{post_alloc_hook}) {
4011 $_->() 4265 $_->()
4012 for values %{delete $self->{post_alloc_hook}}; 4266 for values %{delete $self->{post_alloc_hook}};
4013 } 4267 }
4014
4015 4268
4016 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4269 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4017 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4270 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4018 glClear GL_COLOR_BUFFER_BIT; 4271 glClear GL_COLOR_BUFFER_BIT;
4019 4272
… …
4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4275 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023 glMatrixMode GL_MODELVIEW; 4276 glMatrixMode GL_MODELVIEW;
4024 glLoadIdentity; 4277 glLoadIdentity;
4025 4278
4026 { 4279 {
4027 package CFClient::UI::Base; 4280 package CFPlus::UI::Base;
4028 4281
4029 ($draw_x, $draw_y, $draw_w, $draw_h) = 4282 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030 (0, 0, $self->{w}, $self->{h}); 4283 (0, 0, $self->{w}, $self->{h});
4031 }
4032 4284
4033 $self->_draw; 4285 $self->_draw;
4286 }
4034} 4287}
4035 4288
4036############################################################################# 4289#############################################################################
4037 4290
4038package CFClient::UI; 4291package CFPlus::UI;
4039 4292
4040$ROOT = new CFClient::UI::Root; 4293$ROOT = new CFPlus::UI::Root;
4041$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4294$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042 4295
40431 42961
4044 4297

Diff Legend

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