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.407 by root, Sat Jul 21 23:31:31 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 map $_+0, @widgets
702} 731}
703 732
704sub children { 733sub children {
705 @{ $_[0]{children} } 734 @{ $_[0]{children} }
706} 735}
… …
717} 746}
718 747
719sub clear { 748sub clear {
720 my ($self) = @_; 749 my ($self) = @_;
721 750
722 my $children = delete $self->{children}; 751 my $children = $self->{children};
723 $self->{children} = []; 752 $self->{children} = [];
724 753
725 for (@$children) { 754 for (@$children) {
726 delete $_->{parent}; 755 delete $_->{parent};
727 $_->hide; 756 $_->hide;
… …
752 $_->draw for @{$self->{children}}; 781 $_->draw for @{$self->{children}};
753} 782}
754 783
755############################################################################# 784#############################################################################
756 785
757package CFClient::UI::Bin; 786package CFPlus::UI::Bin;
758 787
759our @ISA = CFClient::UI::Container::; 788our @ISA = CFPlus::UI::Container::;
760 789
761sub new { 790sub new {
762 my ($class, %arg) = @_; 791 my ($class, %arg) = @_;
763 792
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 794
766 $class->SUPER::new (children => [$child], %arg) 795 $class->SUPER::new (children => [$child], %arg)
767} 796}
768 797
769sub add { 798sub add {
… …
776sub remove { 805sub remove {
777 my ($self, $widget) = @_; 806 my ($self, $widget) = @_;
778 807
779 $self->SUPER::remove ($widget); 808 $self->SUPER::remove ($widget);
780 809
781 $self->{children} = [new CFClient::UI::Empty] 810 $self->{children} = [new CFPlus::UI::Empty]
782 unless @{$self->{children}}; 811 unless @{$self->{children}};
783} 812}
784 813
785sub child { $_[0]->{children}[0] } 814sub child { $_[0]->{children}[0] }
786 815
… …
798 827
799############################################################################# 828#############################################################################
800 829
801# back-buffered drawing area 830# back-buffered drawing area
802 831
803package CFClient::UI::Window; 832package CFPlus::UI::Window;
804 833
805our @ISA = CFClient::UI::Bin::; 834our @ISA = CFPlus::UI::Bin::;
806 835
807use CFClient::OpenGL; 836use CFPlus::OpenGL;
808 837
809sub new { 838sub new {
810 my ($class, %arg) = @_; 839 my ($class, %arg) = @_;
811 840
812 my $self = $class->SUPER::new (%arg); 841 my $self = $class->SUPER::new (%arg);
… …
834} 863}
835 864
836sub render_child { 865sub render_child {
837 my ($self) = @_; 866 my ($self) = @_;
838 867
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 869 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 870 glClear GL_COLOR_BUFFER_BIT;
842 871
843 { 872 {
844 package CFClient::UI::Base; 873 package CFPlus::UI::Base;
845 874
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 875 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 876 (0, 0, $self->{w}, $self->{h});
877
878 $self->_render;
848 } 879 }
849
850 $self->_render;
851 }; 880 };
852} 881}
853 882
854sub _draw { 883sub _draw {
855 my ($self) = @_; 884 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 885
859 my $tex = $self->{texture} 886 my $tex = $self->{texture}
860 or return; 887 or return;
861 888
862 glEnable GL_TEXTURE_2D; 889 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 891 glColor 0, 0, 0, 1;
865 892
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 893 $tex->draw_quad_alpha_premultiplied (0, 0);
867 894
868 glDisable GL_TEXTURE_2D; 895 glDisable GL_TEXTURE_2D;
869} 896}
870 897
871############################################################################# 898#############################################################################
872 899
873package CFClient::UI::ViewPort; 900package CFPlus::UI::ViewPort;
874 901
902use List::Util qw(min max);
903
875our @ISA = CFClient::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
876 905
877sub new { 906sub new {
878 my $class = shift; 907 my $class = shift;
879 908
880 $class->SUPER::new ( 909 $class->SUPER::new (
… …
887sub size_request { 916sub size_request {
888 my ($self) = @_; 917 my ($self) = @_;
889 918
890 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
891 920
892 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
894 923
895 ($w, $h) 924 ($w, $h)
896} 925}
897 926
898sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
910} 939}
911 940
912sub set_offset { 941sub set_offset {
913 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
914 943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
915 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
916 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
917 950
951 $self->emit (changed => $x, $y);
918 $self->update; 952 $self->update;
953 }
919} 954}
920 955
921# hmm, this does not work for topleft of $self... but we should not ask for that 956# hmm, this does not work for topleft of $self... but we should not ask for that
922sub coord2local { 957sub coord2local {
923 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
938 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
939 974
940 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
942 ) { 977 ) {
943 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944 } else { 979 } else {
945 $self->CFClient::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
946 } 981 }
947} 982}
948 983
949sub _render { 984sub _render {
950 my ($self) = @_; 985 my ($self) = @_;
951 986
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 987 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}; 988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954 989
955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956 991
957 $self->SUPER::_render; 992 $self->SUPER::_render;
958} 993}
959 994
960############################################################################# 995#############################################################################
961 996
962package CFClient::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
963 998
964our @ISA = CFClient::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
965 1000
966sub new { 1001sub new {
967 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
968 1003
969 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
970 1005
971 my $self; 1006 my $self;
972 1007
973 my $slider = new CFClient::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1011 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub {
1014 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 },
1017 ;
1018
1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
974 vertical => 1, 1022 vertical => 1,
975 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
976 on_changed => sub { 1024 on_changed => sub {
977 $self->{vp}->set_offset (0, $_[1]); 1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978 }, 1027 },
979 ; 1028 ;
980 1029
981 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1033 can_events => 1,
983 slider => $slider, 1034 hslider => $hslider,
1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
984 %arg, 1038 %arg,
985 ); 1039 );
986 1040
1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1044 expand => 1,
1045 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1060 ;
1061
987 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp});
1063
988 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
989 1065
990 $self 1066 $self
991} 1067}
992 1068
… …
994 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
995 1071
996 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
997} 1073}
998 1074
999sub update { 1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
1000 my ($self) = @_; 1106 my ($self, $ev) = @_;
1001 1107
1002 $self->SUPER::update; 1108 $self->grab_focus;
1003 1109
1004 # todo: overwrite size_allocate of child 1110 my $ox = $self->{vp}{view_x};
1005 my $child = $self->{vp}->child; 1111 my $oy = $self->{vp}{view_y};
1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1120 };
1121}
1122
1123sub invoke_mouse_wheel {
1124 my ($self, $ev) = @_;
1125
1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1128
1129 1
1130}
1131
1132sub invoke_button_down {
1133 my ($self, $ev, $x, $y) = @_;
1134
1135 if ($ev->{button} == 2) {
1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1139
1140 0
1141}
1142
1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1145
1146 if (delete $self->{motion}) {
1147 return 1;
1148 }
1149
1150 0
1151}
1152
1153sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_;
1155
1156 if ($self->{motion}) {
1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1160
1161 0
1007} 1162}
1008 1163
1009sub invoke_size_allocate { 1164sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1011 1166
1012 my $child = $self->{vp}->child; 1167 $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) 1168 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1169}
1017 1170
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020
1021############################################################################# 1171#############################################################################
1022 1172
1023package CFClient::UI::Frame; 1173package CFPlus::UI::Frame;
1024 1174
1025our @ISA = CFClient::UI::Bin::; 1175our @ISA = CFPlus::UI::Bin::;
1026 1176
1027use CFClient::OpenGL; 1177use CFPlus::OpenGL;
1028 1178
1029sub new { 1179sub new {
1030 my $class = shift; 1180 my $class = shift;
1031 1181
1032 $class->SUPER::new ( 1182 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1208 $self->SUPER::_draw;
1059} 1209}
1060 1210
1061############################################################################# 1211#############################################################################
1062 1212
1063package CFClient::UI::FancyFrame; 1213package CFPlus::UI::FancyFrame;
1064 1214
1065our @ISA = CFClient::UI::Bin::; 1215our @ISA = CFPlus::UI::Bin::;
1066 1216
1067use CFClient::OpenGL; 1217use CFPlus::OpenGL;
1218
1219sub new {
1220 my ($class, %arg) = @_;
1221
1222 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label
1224 align => 1,
1225 valign => 0,
1226 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75;
1228 }
1229
1230 my $self = $class->SUPER::new (
1231 # label => "",
1232 fg => [0.6, 0.3, 0.1],
1233 border => 0.8,
1234 style => 'single',
1235 %arg,
1236 );
1237
1238 $self
1239}
1240
1241sub add {
1242 my ($self, @widgets) = @_;
1243
1244 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1246}
1247
1248sub border {
1249 int $_[0]{border} * $::FONTSIZE
1250}
1251
1252sub size_request {
1253 my ($self) = @_;
1254
1255 ($self->{label_w}, undef) = $self->{label}->size_request
1256 if $self->{label};
1257
1258 my ($w, $h) = $self->SUPER::size_request;
1259
1260 (
1261 $w + $self->border * 2,
1262 $h + $self->border * 2,
1263 )
1264}
1265
1266sub invoke_size_allocate {
1267 my ($self, $w, $h) = @_;
1268
1269 my $border = $self->border;
1270
1271 $w -= List::Util::max 0, $border * 2;
1272 $h -= List::Util::max 0, $border * 2;
1273
1274 if (my $label = $self->{label}) {
1275 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1276 $label->{h} = List::Util::min $h, $border;
1277 $label->invoke_size_allocate ($label->{w}, $label->{h});
1278 }
1279
1280 $self->child->configure ($border, $border, $w, $h);
1281
1282 1
1283}
1284
1285sub _draw {
1286 my ($self) = @_;
1287
1288 my $child = $self->{children}[0];
1289
1290 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h});
1292
1293 $child->draw;
1294
1295 glColor @{$self->{fg}};
1296 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1301 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1302 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1303 glEnd;
1304
1305 if ($self->{label}) {
1306 glTranslate $border * 2, 0;
1307 $self->{label}->_draw;
1308 }
1309}
1310
1311#############################################################################
1312
1313package CFPlus::UI::Toplevel;
1314
1315our @ISA = CFPlus::UI::Bin::;
1316
1317use CFPlus::OpenGL;
1068 1318
1069my $bg = 1319my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1321 mipmap => 1, wrap => 1;
1072 1322
1073my @border = 1323my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1324 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); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1076 1330
1077sub new { 1331sub new {
1078 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1079 1333
1080 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1335 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1336 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1337 border => 0.6,
1084 can_events => 1, 1338 can_events => 1,
1085 min_w => 16, 1339 min_w => 64,
1086 min_h => 16, 1340 min_h => 32,
1087 %arg, 1341 %arg,
1088 ); 1342 );
1089 1343
1090 $self->{title_widget} = new CFClient::UI::Label 1344 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1345 align => 0,
1092 valign => 1, 1346 valign => 1,
1093 text => $self->{title}, 1347 text => $self->{title},
1094 fontsize => $self->{border}, 1348 fontsize => $self->{border},
1095 if exists $self->{title}; 1349 if exists $self->{title};
1096 1350
1097 if ($self->{has_close_button}) { 1351 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1352 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1353 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1354 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1355 on_activate => sub { $self->emit ("delete") };
1102 1356
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1357 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1358 }
1105 1359
1106 $self 1360 $self
1107} 1361}
1108 1362
1109sub add { 1363sub add {
1110 my ($self, @widgets) = @_; 1364 my ($self, @widgets) = @_;
1111 1365
1112 $self->SUPER::add (@widgets); 1366 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1367 $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}; 1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1369}
1116 1370
1117sub border { 1371sub border {
1118 int $_[0]{border} * $::FONTSIZE 1372 int $_[0]{border} * $::FONTSIZE
1119} 1373}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1406 $self->child->configure ($border, $border, $w, $h);
1153 1407
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1408 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1409 if $self->{close_button};
1156 1410
1411 1
1412}
1413
1414sub invoke_delete {
1415 my ($self) = @_;
1416
1417 $self->hide;
1418
1157 1 1419 1
1158} 1420}
1159 1421
1160sub invoke_button_down { 1422sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1423 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1481 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1482
1221 ! ! $self->{motion} 1483 ! ! $self->{motion}
1222} 1484}
1223 1485
1486sub invoke_visibility_change {
1487 my ($self, $visible) = @_;
1488
1489 delete $self->{motion} unless $visible;
1490
1491 0
1492}
1493
1224sub _draw { 1494sub _draw {
1225 my ($self) = @_; 1495 my ($self) = @_;
1226 1496
1227 my $child = $self->{children}[0]; 1497 my $child = $self->{children}[0];
1228 1498
… …
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234 1504
1235 my $border = $self->border; 1505 my $border = $self->border;
1236 1506
1237 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1238 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242 1526
1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1245 1529
1246 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1265 if $self->{close_button}; 1549 if $self->{close_button};
1266} 1550}
1267 1551
1268############################################################################# 1552#############################################################################
1269 1553
1270package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1271 1555
1272our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1273 1557
1274use List::Util qw(max sum); 1558use List::Util qw(max sum);
1275 1559
1276use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1277 1561
1278sub new { 1562sub new {
1279 my $class = shift; 1563 my $class = shift;
1280 1564
1281 $class->SUPER::new ( 1565 $class->SUPER::new (
1282 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1283 @_, 1568 @_,
1284 ) 1569 )
1285} 1570}
1286 1571
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289}
1290
1291sub add { 1572sub add {
1292 my ($self, $x, $y, $child) = @_; 1573 my ($self, @widgets) = @_;
1293 1574
1294 $child->set_parent ($self); 1575 for my $child (@widgets) {
1295 $self->{children}[$y][$x] = $child; 1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1296 1579
1297 $self->realloc; 1580 $self->SUPER::add (@widgets);
1298} 1581}
1299 1582
1300sub remove { 1583sub add_at {
1584 my $self = shift;
1585
1586 my @widgets;
1587
1588 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1590
1591 $child->{row} = $row;
1592 $child->{col} = $col;
1593
1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1301 my ($self, $child) = @_; 1601 my ($self) = @_;
1302 1602
1303 # TODO: not yet implemented 1603 my (@w, @h);
1304}
1305
1306# TODO: move to container class maybe? send children a signal on removal?
1307sub clear {
1308 my ($self) = @_;
1309 1604
1310 my @children = $self->children; 1605 my @children = $self->children;
1311 delete $self->{children}; 1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1312 1616 }
1313 for (@children) {
1314 delete $_->{parent};
1315 $_->hide;
1316 }
1317 1617
1318 $self->realloc; 1618 # second pass, rows
1319} 1619 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)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1334 1621
1335 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1336 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337 } 1626 }
1338 } 1627 }
1339 1628
1340 (\@w, \@h) 1629 (\@w, \@h)
1341} 1630}
… …
1357 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1358 1647
1359 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1361 1650
1362 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1363 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1366 1655
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1657
1371 CFClient::UI::harmonize $ws; 1658 CFPlus::UI::harmonize $ws;
1659
1660 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1;
1663
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665
1372 CFClient::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1373 1667
1374 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375 1670
1376 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1377 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1378 or next;
1379 1673
1380 my $x = 0; 1674 $widget->configure (
1381 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382 1677 );
1383 for my $c (0 .. $#$row) { 1678 }
1384 my $col_w = $ws->[$c];
1385 1679
1386 if (my $widget = $row->[$c]) { 1680 1
1387 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1388 }
1389 1682
1390 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) {
1699 my ($mode, $val, $max) = @_;
1700
1701 $mode eq "abs" ? $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704}
1705
1706sub size_request {
1707 my ($self) = @_;
1708
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710
1711 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1714
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1391 } 1721 }
1722 }
1392 1723
1393 $y += $row_h; 1724 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1;
1726
1727 # now layout remaining widgets
1728 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1730
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1739 }
1740 }
1741
1742 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1;
1744
1745 ($W, $H)
1746}
1747
1748sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_;
1750
1751 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1753
1754 $x = _scale $pos, $x, $W;
1755 $y = _scale $pos, $x, $H;
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758
1759 $child->configure ($x, $y, $w, $h);
1394 } 1760 }
1395 1761
1396 1 1762 1
1397} 1763}
1398 1764
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############################################################################# 1765#############################################################################
1424 1766
1425package CFClient::UI::Box; 1767package CFPlus::UI::Box;
1426 1768
1427our @ISA = CFClient::UI::Container::; 1769our @ISA = CFPlus::UI::Container::;
1428 1770
1429sub size_request { 1771sub size_request {
1430 my ($self) = @_; 1772 my ($self) = @_;
1431 1773
1432 $self->{vertical} 1774 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1807 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1808 for 0 .. $#children;
1467 } 1809 }
1468 } 1810 }
1469 1811
1470 CFClient::UI::harmonize \@req; 1812 CFPlus::UI::harmonize \@req;
1471 1813
1472 my $pos = 0; 1814 my $pos = 0;
1473 for (0 .. $#children) { 1815 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1816 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1817 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1822 1
1481} 1823}
1482 1824
1483############################################################################# 1825#############################################################################
1484 1826
1485package CFClient::UI::HBox; 1827package CFPlus::UI::HBox;
1486 1828
1487our @ISA = CFClient::UI::Box::; 1829our @ISA = CFPlus::UI::Box::;
1488 1830
1489sub new { 1831sub new {
1490 my $class = shift; 1832 my $class = shift;
1491 1833
1492 $class->SUPER::new ( 1834 $class->SUPER::new (
… …
1495 ) 1837 )
1496} 1838}
1497 1839
1498############################################################################# 1840#############################################################################
1499 1841
1500package CFClient::UI::VBox; 1842package CFPlus::UI::VBox;
1501 1843
1502our @ISA = CFClient::UI::Box::; 1844our @ISA = CFPlus::UI::Box::;
1503 1845
1504sub new { 1846sub new {
1505 my $class = shift; 1847 my $class = shift;
1506 1848
1507 $class->SUPER::new ( 1849 $class->SUPER::new (
… …
1510 ) 1852 )
1511} 1853}
1512 1854
1513############################################################################# 1855#############################################################################
1514 1856
1515package CFClient::UI::Label; 1857package CFPlus::UI::Label;
1516 1858
1517our @ISA = CFClient::UI::DrawBG::; 1859our @ISA = CFPlus::UI::DrawBG::;
1518 1860
1519use CFClient::OpenGL; 1861use CFPlus::OpenGL;
1520 1862
1521sub new { 1863sub new {
1522 my ($class, %arg) = @_; 1864 my ($class, %arg) = @_;
1523 1865
1524 my $self = $class->SUPER::new ( 1866 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1869 #active_bg => none
1528 #font => default_font 1870 #font => default_font
1529 #text => initial text 1871 #text => initial text
1530 #markup => initial narkup 1872 #markup => initial narkup
1531 #max_w => maximum pixel width 1873 #max_w => maximum pixel width
1874 #style => 0, # render flags
1532 ellipsise => 3, # end 1875 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1876 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1877 fontsize => 1,
1535 align => -1, 1878 align => -1,
1536 valign => -1, 1879 valign => -1,
1537 padding_x => 2, 1880 padding_x => 2,
1538 padding_y => 2, 1881 padding_y => 2,
1539 can_events => 0, 1882 can_events => 0,
1540 %arg 1883 %arg
1541 ); 1884 );
1542 1885
1543 if (exists $self->{template}) { 1886 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1887 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1888 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1889 $self->{template} = $layout;
1547 } 1890 }
1548 1891
1549 if (exists $self->{markup}) { 1892 if (exists $self->{markup}) {
… …
1553 } 1896 }
1554 1897
1555 $self 1898 $self
1556} 1899}
1557 1900
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1901sub update {
1569 my ($self) = @_; 1902 my ($self) = @_;
1570 1903
1571 delete $self->{texture}; 1904 delete $self->{texture};
1572 $self->SUPER::update; 1905 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1584 1917
1585 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
1587 1920
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1921 $self->{layout}->set_text ($text);
1590 1922
1591 delete $self->{size_req}; 1923 delete $self->{size_req};
1592 $self->realloc; 1924 $self->realloc;
1593 $self->update; 1925 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1931 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1932 $self->{text} = "M$markup";
1601 1933
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1934 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1935
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1936 $self->{layout}->set_markup ($markup);
1606 1937
1607 delete $self->{size_req}; 1938 delete $self->{size_req};
1608 $self->realloc; 1939 $self->realloc;
1609 $self->update; 1940 $self->update;
… …
1621 1952
1622 my ($w, $h) = $self->{layout}->size; 1953 my ($w, $h) = $self->{layout}->size;
1623 1954
1624 if (exists $self->{template}) { 1955 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1956 $self->{template}->set_font ($self->{font}) if $self->{font};
1957 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1958 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1959
1628 my ($w2, $h2) = $self->{template}->size; 1960 my ($w2, $h2) = $self->{template}->size;
1629 1961
1630 $w = List::Util::max $w, $w2; 1962 $w = List::Util::max $w, $w2;
… …
1654 1986
1655sub set_fontsize { 1987sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1988 my ($self, $fontsize) = @_;
1657 1989
1658 $self->{fontsize} = $fontsize; 1990 $self->{fontsize} = $fontsize;
1991 delete $self->{size_req};
1659 delete $self->{texture}; 1992 delete $self->{texture};
1660 1993
1661 $self->realloc; 1994 $self->realloc;
1662} 1995}
1663 1996
1664sub reconfigure { 1997sub reconfigure {
1665 my ($self) = @_; 1998 my ($self) = @_;
1666 1999
1667 delete $self->{size_req}; 2000 delete $self->{size_req};
2001 delete $self->{texture};
1668 2002
1669 $self->SUPER::reconfigure; 2003 $self->SUPER::reconfigure;
1670} 2004}
1671 2005
1672sub _draw { 2006sub _draw {
1673 my ($self) = @_; 2007 my ($self) = @_;
1674 2008
1675 $self->SUPER::_draw; # draw background, if applicable 2009 $self->SUPER::_draw; # draw background, if applicable
1676 2010
1677 my $tex = $self->{texture} ||= do { 2011 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 2012 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2013 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 2014 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2015 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2016 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2017 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 2018
1685 new_from_layout CFClient::Texture $self->{layout} 2019 [$self->{layout}->size]
1686 }; 2020 };
1687 2021
1688 unless (exists $self->{ox}) { 2022 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2023 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2024 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
1692 2026
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 2030 };
1697 2031
1698 glEnable GL_TEXTURE_2D; 2032# unless ($self->{list}) {
1699 2033# $self->{list} = CFPlus::OpenGL::glGenList;
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2034# CFPlus::OpenGL::glNewList $self->{list};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2035# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702 2036# 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 } 2037# }
2038#
2039# CFPlus::OpenGL::glCallList $self->{list};
1711 2040
1712 glDisable GL_TEXTURE_2D; 2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713} 2042}
2043
2044#sub destroy {
2045# my ($self) = @_;
2046#
2047# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048#
2049# $self->SUPER::destroy;
2050#}
1714 2051
1715############################################################################# 2052#############################################################################
1716 2053
1717package CFClient::UI::EntryBase; 2054package CFPlus::UI::EntryBase;
1718 2055
1719our @ISA = CFClient::UI::Label::; 2056our @ISA = CFPlus::UI::Label::;
1720 2057
1721use CFClient::OpenGL; 2058use CFPlus::OpenGL;
1722 2059
1723sub new { 2060sub new {
1724 my $class = shift; 2061 my $class = shift;
1725 2062
1726 $class->SUPER::new ( 2063 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 2067 active_fg => [0, 0, 0],
1731 can_hover => 1, 2068 can_hover => 1,
1732 can_focus => 1, 2069 can_focus => 1,
1733 valign => 0, 2070 valign => 0,
1734 can_events => 1, 2071 can_events => 1,
2072 ellipsise => 0,
1735 #text => ... 2073 #text => ...
1736 #hidden => "*", 2074 #hidden => "*",
1737 @_ 2075 @_
1738 ) 2076 )
1739} 2077}
… …
1784 my $sym = $ev->{sym}; 2122 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2123 my $uni = $ev->{unicode};
1786 2124
1787 my $text = $self->get_text; 2125 my $text = $self->get_text;
1788 2126
2127 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2128
1789 if ($uni == 8) { 2129 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2130 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2131 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2132 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2133 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2134 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2135 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2136 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 2137 } elsif ($sym == CFPlus::SDLK_HOME) {
2138 # what a hack
2139 $self->{cursor} =
2140 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2141 ? length $1
2142 : 0;
2143 } elsif ($sym == CFPlus::SDLK_END) {
2144 # uh, again
2145 $self->{cursor} =
2146 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2147 ? $self->{cursor} + length $1
2148 : length $self->{text};
2149 } elsif ($uni == 21) { # ctrl-u
2150 $text = "";
1798 $self->{cursor} = 0; 2151 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2152 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2153 $self->emit ('escape');
1803 } elsif ($uni) { 2154 } elsif ($uni == 0x0d) {
2155 substr $text, $self->{cursor}++, 0, "\012";
2156 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2157 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2158 } else {
1806 return 0; 2159 return 0;
1807 } 2160 }
1808 2161
1809 $self->_set_text ($text); 2162 $self->_set_text ($text);
1810 2163
1811 $self->realloc; 2164 $self->realloc;
2165 $self->update;
1812 2166
1813 1 2167 1
1814} 2168}
1815 2169
1816sub invoke_focus_in { 2170sub invoke_focus_in {
… …
1828 2182
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2183 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2184
1831 # byte-index to char-index 2185 # byte-index to char-index
1832 my $text = $self->{text}; 2186 my $text = $self->{text};
1833 utf8::encode $text; 2187 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2188 $self->{cursor} = length $text;
1835 2189
1836 $self->_set_text ($self->{text}); 2190 $self->_set_text ($self->{text});
1837 $self->update; 2191 $self->update;
1838 2192
1839 1 2193 1
… …
1878 utf8::encode $text; 2232 utf8::encode $text;
1879 2233
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2234 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2235 }
1882 2236
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2237 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2238 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}; 2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2240 glEnd;
1888 } 2241 }
1889} 2242}
1890 2243
2244#############################################################################
2245
1891package CFClient::UI::Entry; 2246package CFPlus::UI::Entry;
1892 2247
1893our @ISA = CFClient::UI::EntryBase::; 2248our @ISA = CFPlus::UI::EntryBase::;
1894 2249
1895use CFClient::OpenGL; 2250use CFPlus::OpenGL;
1896 2251
1897sub invoke_key_down { 2252sub invoke_key_down {
1898 my ($self, $ev) = @_; 2253 my ($self, $ev) = @_;
1899 2254
1900 my $sym = $ev->{sym}; 2255 my $sym = $ev->{sym};
1901 2256
1902 if ($sym == 13) { 2257 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2258 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2259 my $txt = $self->get_text;
1905 2260
1906 $self->{history_pointer} = -1; 2261 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2262 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2263 $self->emit (activate => $txt);
1909 $self->update; 2264 $self->update;
1910 2265
1911 } elsif ($sym == CFClient::SDLK_UP) { 2266 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2267 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2268 $self->{history_saveback} = $self->get_text;
1914 } 2269 }
1915 if (@{$self->{history} || []} > 0) { 2270 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2271 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2273 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2274 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2275 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2276 }
1922 2277
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2278 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2279 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2280 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2281
1927 if ($self->{history_pointer} >= 0) { 2282 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2283 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2292 1
1938} 2293}
1939 2294
1940############################################################################# 2295#############################################################################
1941 2296
2297package CFPlus::UI::TextEdit;
2298
2299our @ISA = CFPlus::UI::EntryBase::;
2300
2301use CFPlus::OpenGL;
2302
2303sub move_cursor_ver {
2304 my ($self, $dy) = @_;
2305
2306 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2307
2308 $y += $dy;
2309
2310 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2311 $self->{cursor} = $index;
2312 delete $self->{cur_h};
2313 $self->update;
2314 return;
2315 }
2316}
2317
2318sub invoke_key_down {
2319 my ($self, $ev) = @_;
2320
2321 my $sym = $ev->{sym};
2322
2323 if ($sym == CFPlus::SDLK_UP) {
2324 $self->move_cursor_ver (-1);
2325 } elsif ($sym == CFPlus::SDLK_DOWN) {
2326 $self->move_cursor_ver (+1);
2327 } else {
2328 return $self->SUPER::invoke_key_down ($ev)
2329 }
2330
2331 1
2332}
2333
2334#############################################################################
2335
1942package CFClient::UI::Button; 2336package CFPlus::UI::Button;
1943 2337
1944our @ISA = CFClient::UI::Label::; 2338our @ISA = CFPlus::UI::Label::;
1945 2339
1946use CFClient::OpenGL; 2340use CFPlus::OpenGL;
1947 2341
1948my @tex = 2342my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2343 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2344 qw(b1_button_inactive.png b1_button_active.png);
1951 2345
1952sub new { 2346sub new {
1953 my $class = shift; 2347 my $class = shift;
1954 2348
1955 $class->SUPER::new ( 2349 $class->SUPER::new (
1956 padding_x => 4, 2350 padding_x => 4,
1957 padding_y => 4, 2351 padding_y => 4,
1958 fg => [1, 1, 1], 2352 fg => [1.0, 1.0, 1.0],
1959 active_fg => [0, 0, 1], 2353 active_fg => [0.8, 0.8, 0.8],
1960 can_hover => 1, 2354 can_hover => 1,
1961 align => 0, 2355 align => 0,
1962 valign => 0, 2356 valign => 0,
1963 can_events => 1, 2357 can_events => 1,
1964 @_ 2358 @_
… …
1982 2376
1983 glEnable GL_TEXTURE_2D; 2377 glEnable GL_TEXTURE_2D;
1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985 glColor 0, 0, 0, 1; 2379 glColor 0, 0, 0, 1;
1986 2380
2381 my $tex = $tex[$GRAB == $self];
1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2382 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988 2383
1989 glDisable GL_TEXTURE_2D; 2384 glDisable GL_TEXTURE_2D;
1990 2385
1991 $self->SUPER::_draw; 2386 $self->SUPER::_draw;
1992} 2387}
1993 2388
1994############################################################################# 2389#############################################################################
1995 2390
2391package CFPlus::UI::CheckBox;
2392
2393our @ISA = CFPlus::UI::DrawBG::;
2394
2395my @tex =
2396 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2397 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2398
2399use CFPlus::OpenGL;
2400
2401sub new {
2402 my $class = shift;
2403
2404 $class->SUPER::new (
2405 padding_x => 2,
2406 padding_y => 2,
2407 fg => [1, 1, 1],
2408 active_fg => [1, 1, 0],
2409 bg => [0, 0, 0, 0.2],
2410 active_bg => [1, 1, 1, 0.5],
2411 state => 0,
2412 can_hover => 1,
2413 @_
2414 )
2415}
2416
2417sub size_request {
2418 my ($self) = @_;
2419
2420 (6) x 2
2421}
2422
2423sub toggle {
2424 my ($self) = @_;
2425
2426 $self->{state} = !$self->{state};
2427 $self->emit (changed => $self->{state});
2428 $self->update;
2429}
2430
2431sub invoke_button_down {
2432 my ($self, $ev, $x, $y) = @_;
2433
2434 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2435 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2436 $self->toggle;
2437 } else {
2438 return 0
2439 }
2440
2441 1
2442}
2443
2444sub _draw {
2445 my ($self) = @_;
2446
2447 $self->SUPER::_draw;
2448
2449 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2450
2451 my ($w, $h) = @$self{qw(w h)};
2452
2453 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2454
2455 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2456
2457 my $tex = $self->{state} ? $tex[1] : $tex[0];
2458
2459 glEnable GL_TEXTURE_2D;
2460 $tex->draw_quad_alpha (0, 0, $s, $s);
2461 glDisable GL_TEXTURE_2D;
2462}
2463
2464#############################################################################
2465
2466package CFPlus::UI::Image;
2467
2468our @ISA = CFPlus::UI::Base::;
2469
2470use CFPlus::OpenGL;
2471
2472our %texture_cache;
2473
2474sub new {
2475 my $class = shift;
2476
2477 my $self = $class->SUPER::new (
2478 can_events => 0,
2479 @_,
2480 );
2481
2482 $self->{path} || $self->{tex}
2483 or Carp::croak "'path' or 'tex' attributes required";
2484
2485 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2486 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2487
2488 CFPlus::weaken $texture_cache{$self->{path}};
2489
2490 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2491
2492 $self
2493}
2494
2495sub STORABLE_freeze {
2496 my ($self, $cloning) = @_;
2497
2498 $self->{path}
2499 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2500
2501 $self->{path}
2502}
2503
2504sub STORABLE_attach {
2505 my ($self, $cloning, $path) = @_;
2506
2507 $self->new (path => $path)
2508}
2509
2510sub size_request {
2511 my ($self) = @_;
2512
2513 ($self->{tex}{w}, $self->{tex}{h})
2514}
2515
2516sub _draw {
2517 my ($self) = @_;
2518
2519 my $tex = $self->{tex};
2520
2521 my ($w, $h) = ($self->{w}, $self->{h});
2522
2523 if ($self->{rot90}) {
2524 glRotate 90, 0, 0, 1;
2525 glTranslate 0, -$self->{w}, 0;
2526
2527 ($w, $h) = ($h, $w);
2528 }
2529
2530 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532
2533 $tex->draw_quad (0, 0, $w, $h);
2534
2535 glDisable GL_TEXTURE_2D;
2536}
2537
2538#############################################################################
2539
1996package CFClient::UI::ImageButton; 2540package CFPlus::UI::ImageButton;
1997 2541
1998our @ISA = CFClient::UI::Image::; 2542our @ISA = CFPlus::UI::Image::;
1999 2543
2000use CFClient::OpenGL; 2544use CFPlus::OpenGL;
2001 2545
2002my %textures; 2546my %textures;
2003 2547
2004sub new { 2548sub new {
2005 my $class = shift; 2549 my $class = shift;
… …
2027 1 2571 1
2028} 2572}
2029 2573
2030############################################################################# 2574#############################################################################
2031 2575
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; 2576package CFPlus::UI::VGauge;
2101 2577
2102our @ISA = CFClient::UI::Base::; 2578our @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 2579
2163use List::Util qw(min max); 2580use List::Util qw(min max);
2164 2581
2165use CFClient::OpenGL; 2582use CFPlus::OpenGL;
2166 2583
2167my %tex = ( 2584my %tex = (
2168 food => [ 2585 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2586 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2587 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2588 ],
2172 grace => [ 2589 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2590 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/ 2591 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2592 ],
2176 hp => [ 2593 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2594 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2595 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2596 ],
2180 mana => [ 2597 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2598 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/ 2599 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2600 ],
2184); 2601);
2185 2602
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2603# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2663 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2664 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2665
2249 my $h1 = $self->{h} * (1 - $ycut1); 2666 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2667 my $h2 = $self->{h} * (1 - $ycut2);
2668 my $h3 = $self->{h};
2669
2670 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2671
2252 glEnable GL_BLEND; 2672 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2673 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2674 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2675 glEnable GL_TEXTURE_2D;
… …
2274 2694
2275 if ($t3) { 2695 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2696 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2697 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2698 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2699 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2700 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2701 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2702 glEnd;
2283 } 2703 }
2284 2704
2285 glDisable GL_BLEND; 2705 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2706 glDisable GL_TEXTURE_2D;
2287} 2707}
2288 2708
2289############################################################################# 2709#############################################################################
2290 2710
2291package CFClient::UI::Gauge; 2711package CFPlus::UI::Gauge;
2292 2712
2293our @ISA = CFClient::UI::VBox::; 2713our @ISA = CFPlus::UI::VBox::;
2294 2714
2295sub new { 2715sub new {
2296 my ($class, %arg) = @_; 2716 my ($class, %arg) = @_;
2297 2717
2298 my $self = $class->SUPER::new ( 2718 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2720 can_hover => 1,
2301 can_events => 1, 2721 can_events => 1,
2302 %arg, 2722 %arg,
2303 ); 2723 );
2304 2724
2305 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2725 $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); 2726 $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"); 2727 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308 2728
2309 $self 2729 $self
2310} 2730}
2311 2731
2312sub set_fontsize { 2732sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2753 $self->{value}->set_text ($val);
2334} 2754}
2335 2755
2336############################################################################# 2756#############################################################################
2337 2757
2338package CFClient::UI::Slider; 2758package CFPlus::UI::Slider;
2339 2759
2340use strict; 2760use strict;
2341 2761
2342use CFClient::OpenGL; 2762use CFPlus::OpenGL;
2343 2763
2344our @ISA = CFClient::UI::DrawBG::; 2764our @ISA = CFPlus::UI::DrawBG::;
2345 2765
2346my @tex = 2766my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2767 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2768 qw(s1_slider.png s1_slider_bg.png);
2349 2769
2350sub new { 2770sub new {
2351 my $class = shift; 2771 my $class = shift;
2352 2772
… …
2441 } 2861 }
2442 2862
2443 1 2863 1
2444} 2864}
2445 2865
2866sub invoke_mouse_wheel {
2867 my ($self, $ev) = @_;
2868
2869 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2870
2871 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2872
2873 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2874
2875 ! ! $delta
2876}
2877
2446sub update { 2878sub update {
2447 my ($self) = @_; 2879 my ($self) = @_;
2448 2880
2449 delete $self->{knob_w}; 2881 delete $self->{knob_w};
2450 $self->SUPER::update; 2882 $self->SUPER::update;
… …
2497 glDisable GL_TEXTURE_2D; 2929 glDisable GL_TEXTURE_2D;
2498} 2930}
2499 2931
2500############################################################################# 2932#############################################################################
2501 2933
2502package CFClient::UI::ValSlider; 2934package CFPlus::UI::ValSlider;
2503 2935
2504our @ISA = CFClient::UI::HBox::; 2936our @ISA = CFPlus::UI::HBox::;
2505 2937
2506sub new { 2938sub new {
2507 my ($class, %arg) = @_; 2939 my ($class, %arg) = @_;
2508 2940
2509 my $range = delete $arg{range}; 2941 my $range = delete $arg{range};
2510 2942
2511 my $self = $class->SUPER::new ( 2943 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2944 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2945 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 2946 to_value => sub { shift },
2515 from_value => sub { shift }, 2947 from_value => sub { shift },
2516 %arg, 2948 %arg,
2517 ); 2949 );
2518 2950
… …
2538sub set_range { shift->{slider}->set_range (@_) } 2970sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 2971sub set_value { shift->{slider}->set_value (@_) }
2540 2972
2541############################################################################# 2973#############################################################################
2542 2974
2543package CFClient::UI::TextScroller; 2975package CFPlus::UI::TextScroller;
2544 2976
2545our @ISA = CFClient::UI::HBox::; 2977our @ISA = CFPlus::UI::HBox::;
2546 2978
2547use CFClient::OpenGL; 2979use CFPlus::OpenGL;
2548 2980
2549sub new { 2981sub new {
2550 my $class = shift; 2982 my $class = shift;
2551 2983
2552 my $self = $class->SUPER::new ( 2984 my $self = $class->SUPER::new (
2553 fontsize => 1, 2985 fontsize => 1,
2554 can_events => 0, 2986 can_events => 1,
2555 indent => 0, 2987 indent => 0,
2556 #font => default_font 2988 #font => default_font
2557 @_, 2989 @_,
2558 2990
2559 layout => (new CFClient::Layout 1), 2991 layout => (new CFPlus::Layout),
2560 par => [], 2992 par => [],
2993 max_par => 0,
2561 height => 0, 2994 height => 0,
2562 children => [ 2995 children => [
2563 (new CFClient::UI::Empty expand => 1), 2996 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2997 (new CFPlus::UI::Slider vertical => 1),
2565 ], 2998 ],
2566 ); 2999 );
2567 3000
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 3001 $self->{children}[1]->connect (changed => sub { $self->update });
2569 3002
… …
2575 3008
2576 $self->{fontsize} = $fontsize; 3009 $self->{fontsize} = $fontsize;
2577 $self->reflow; 3010 $self->reflow;
2578} 3011}
2579 3012
2580sub visible_children { 3013sub size_request {
2581 my ($self) = @_; 3014 my ($self) = @_;
2582 3015
2583 @{$self->{children}}[0,1] 3016 my ($empty, $slider) = @{ $self->{children} };
3017
3018 local $self->{children} = [$empty, $slider];
3019 $self->SUPER::size_request
2584} 3020}
2585 3021
2586sub invoke_size_allocate { 3022sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 3023 my ($self, $w, $h) = @_;
2588 3024
… …
2594 $self->{layout}->set_width ($empty->{w}); 3030 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3031 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 3032
2597 $self->reflow; 3033 $self->reflow;
2598 3034
3035 local $self->{children} = [$empty, $slider];
2599 $self->SUPER::invoke_size_allocate ($w, $h) 3036 $self->SUPER::invoke_size_allocate ($w, $h)
3037}
3038
3039sub invoke_mouse_wheel {
3040 my ($self, $ev) = @_;
3041
3042 return 0 unless $ev->{dy}; # only vertical movements
3043
3044 $self->{children}[1]->emit (mouse_wheel => $ev);
3045
3046 1
2600} 3047}
2601 3048
2602sub get_layout { 3049sub get_layout {
2603 my ($self, $para) = @_; 3050 my ($self, $para) = @_;
2604 3051
… …
2632 3079
2633 # todo: base offset on lines or so, not on pixels 3080 # todo: base offset on lines or so, not on pixels
2634 $self->{children}[1]->set_value ($offset); 3081 $self->{children}[1]->set_value ($offset);
2635} 3082}
2636 3083
3084sub current_paragraph {
3085 my ($self) = @_;
3086
3087 $self->{top_paragraph} - 1
3088}
3089
3090sub scroll_to {
3091 my ($self, $para) = @_;
3092
3093 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3094
3095 $self->{scroll_to} = $para;
3096 $self->update;
3097}
3098
2637sub clear { 3099sub clear {
2638 my ($self) = @_; 3100 my ($self) = @_;
2639 3101
2640 my (undef, undef, @other) = @{ $self->{children} }; 3102 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other; 3103 $self->remove ($_) for @other;
… …
2644 $self->{height} = 0; 3106 $self->{height} = 0;
2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3107 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646} 3108}
2647 3109
2648sub add_paragraph { 3110sub add_paragraph {
2649 my ($self, $color, $para, $indent) = @_; 3111 my $self = shift;
2650 3112
2651 my ($text, @w) = ref $para ? @$para : $para; 3113 for my $para (@_) {
2652
2653 $para = { 3114 $para = {
3115 fg => [1, 1, 1, 1],
3116 indent => 0,
3117 markup => "",
3118 widget => [],
3119 ref $para ? %$para : (markup => $para),
2654 w => 1e10, 3120 w => 1e10,
2655 wrapped => 1, 3121 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2660 }; 3122 };
2661 3123
2662 $self->add (@w) if @w; 3124 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663 push @{$self->{par}}, $para; 3125 push @{$self->{par}}, $para;
3126 }
3127
3128 if (my $max = $self->{max_par}) {
3129 shift @{$self->{par}} while @{$self->{par}} > $max;
3130 }
2664 3131
2665 $self->{need_reflow}++; 3132 $self->{need_reflow}++;
2666 $self->update; 3133 $self->update;
2667} 3134}
2668 3135
2669sub scroll_to_bottom { 3136sub scroll_to_bottom {
2670 my ($self) = @_; 3137 my ($self) = @_;
2671 3138
2672 $self->{scroll_to_bottom} = 1; 3139 $self->{scroll_to} = $#{$self->{par}};
2673 $self->update; 3140 $self->update;
2674} 3141}
2675 3142
3143sub force_uptodate {
3144 my ($self) = @_;
3145
3146 if (delete $self->{need_reflow}) {
3147 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3148
3149 my $height = 0;
3150
3151 for my $para (@{$self->{par}}) {
3152 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3153 my $layout = $self->get_layout ($para);
3154 my ($w, $h) = $layout->size;
3155
3156 $para->{w} = $w + $para->{indent};
3157 $para->{h} = $h;
3158 $para->{wrapped} = $layout->has_wrapped;
3159 }
3160
3161 $para->{y} = $height;
3162 $height += $para->{h};
3163 }
3164
3165 $self->{height} = $height;
3166 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3167
3168 delete $self->{texture};
3169 }
3170
3171 if (my $paridx = delete $self->{scroll_to}) {
3172 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3173 }
3174}
3175
2676sub update { 3176sub update {
2677 my ($self) = @_; 3177 my ($self) = @_;
2678 3178
2679 $self->SUPER::update; 3179 $self->SUPER::update;
2680 3180
2681 return unless $self->{h} > 0; 3181 return unless $self->{h} > 0;
2682 3182
2683 delete $self->{texture}; 3183 delete $self->{texture};
2684 3184
2685 $ROOT->on_post_alloc ($self => sub { 3185 $ROOT->on_post_alloc ($self => sub {
3186 $self->force_uptodate;
3187
2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3188 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687 3189
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 { 3190 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716 glClearColor 0, 0, 0, 0; 3191 glClearColor 0, 0, 0, 0;
2717 glClear GL_COLOR_BUFFER_BIT; 3192 glClear GL_COLOR_BUFFER_BIT;
2718 3193
3194 package CFPlus::UI::Base;
3195 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3196 (0, 0, $self->{w}, $self->{h});
3197
3198 my $top = int $self->{children}[1]{range}[0];
3199
3200 my $paridx = 0;
3201 my $top_paragraph;
2719 my $top = int $self->{children}[1]{range}[0]; 3202 my $top = int $self->{children}[1]{range}[0];
2720 3203
2721 my $y0 = $top; 3204 my $y0 = $top;
2722 my $y1 = $top + $H; 3205 my $y1 = $top + $H;
2723 3206
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}}) { 3207 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 3208 my $h = $para->{h};
3209 my $y = $para->{y};
2732 3210
2733 if ($y0 < $y + $h && $y < $y1) { 3211 if ($y0 < $y + $h && $y < $y1) {
2734
2735 my $layout = $self->get_layout ($para); 3212 my $layout = $self->get_layout ($para);
2736 3213
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 3214 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741 3215
2742 if (my @w = @{ $para->{widget} }) { 3216 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 3217 my @s = $layout->get_shapes;
2744 3218
2745 for (@w) { 3219 for (@w) {
… …
2751 $_->draw; 3225 $_->draw;
2752 } 3226 }
2753 } 3227 }
2754 } 3228 }
2755 3229
2756 $y += $h; 3230 $paridx++;
3231 $top_paragraph ||= $paridx if $y >= $top;
2757 } 3232 }
2758 3233
2759 glDisable GL_BLEND; 3234 $self->{top_paragraph} = $top_paragraph;
2760 }; 3235 };
2761 }); 3236 });
2762} 3237}
2763 3238
2764sub reconfigure { 3239sub reconfigure {
… …
2782 $self->{children}[1]->draw; 3257 $self->{children}[1]->draw;
2783} 3258}
2784 3259
2785############################################################################# 3260#############################################################################
2786 3261
2787package CFClient::UI::Animator; 3262package CFPlus::UI::Animator;
2788 3263
2789use CFClient::OpenGL; 3264use CFPlus::OpenGL;
2790 3265
2791our @ISA = CFClient::UI::Bin::; 3266our @ISA = CFPlus::UI::Bin::;
2792 3267
2793sub moveto { 3268sub moveto {
2794 my ($self, $x, $y) = @_; 3269 my ($self, $x, $y) = @_;
2795 3270
2796 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3271 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2824 glPopMatrix; 3299 glPopMatrix;
2825} 3300}
2826 3301
2827############################################################################# 3302#############################################################################
2828 3303
2829package CFClient::UI::Flopper; 3304package CFPlus::UI::Flopper;
2830 3305
2831our @ISA = CFClient::UI::Button::; 3306our @ISA = CFPlus::UI::Button::;
2832 3307
2833sub new { 3308sub new {
2834 my $class = shift; 3309 my $class = shift;
2835 3310
2836 my $self = $class->SUPER::new ( 3311 my $self = $class->SUPER::new (
… …
2848 $self->{other}->toggle_visibility; 3323 $self->{other}->toggle_visibility;
2849} 3324}
2850 3325
2851############################################################################# 3326#############################################################################
2852 3327
2853package CFClient::UI::Tooltip; 3328package CFPlus::UI::Tooltip;
2854 3329
2855our @ISA = CFClient::UI::Bin::; 3330our @ISA = CFPlus::UI::Bin::;
2856 3331
2857use CFClient::OpenGL; 3332use CFPlus::OpenGL;
2858 3333
2859sub new { 3334sub new {
2860 my $class = shift; 3335 my $class = shift;
2861 3336
2862 $class->SUPER::new ( 3337 $class->SUPER::new (
… …
2865 ) 3340 )
2866} 3341}
2867 3342
2868sub set_tooltip_from { 3343sub set_tooltip_from {
2869 my ($self, $widget) = @_; 3344 my ($self, $widget) = @_;
3345
3346 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3347 if $widget->{tooltip} =~ /^#(.*)$/;
2870 3348
2871 my $tooltip = $widget->{tooltip}; 3349 my $tooltip = $widget->{tooltip};
2872 3350
2873 if ($ENV{CFPLUS_DEBUG} & 2) { 3351 if ($ENV{CFPLUS_DEBUG} & 2) {
2874 $tooltip .= "\n\n" . (ref $widget) . "\n" 3352 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2878 } 3356 }
2879 3357
2880 $tooltip =~ s/^\n+//; 3358 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//; 3359 $tooltip =~ s/\n+$//;
2882 3360
2883 $self->add (new CFClient::UI::Label 3361 $self->add (new CFPlus::UI::Label
2884 markup => $tooltip, 3362 markup => $tooltip,
2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3363 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886 fontsize => 0.8, 3364 fontsize => 0.8,
2887 fg => [0, 0, 0, 1], 3365 style => 1, # FLAG_INVERSE
2888 ellipsise => 0, 3366 ellipsise => 0,
2889 font => ($widget->{tooltip_font} || $::FONT_PROP), 3367 font => ($widget->{tooltip_font} || $::FONT_PROP),
2890 ); 3368 );
2891} 3369}
2892 3370
… …
2911 3389
2912 $self->{root}->on_post_alloc ("move_$self" => sub { 3390 $self->{root}->on_post_alloc ("move_$self" => sub {
2913 my $widget = $self->{owner} 3391 my $widget = $self->{owner}
2914 or return; 3392 or return;
2915 3393
3394 if ($widget->{visible}) {
2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3395 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917 3396
2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3397 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919 if $x + $self->{w} > $self->{root}{w}; 3398 if $x + $self->{w} > $self->{root}{w};
2920 3399
2921 $self->move_abs ($x, $y); 3400 $self->move_abs ($x, $y);
3401 } else {
3402 $self->hide;
3403 }
2922 }); 3404 });
2923} 3405}
2924 3406
2925sub _draw { 3407sub _draw {
2926 my ($self) = @_; 3408 my ($self) = @_;
… …
2950 $self->SUPER::_draw; 3432 $self->SUPER::_draw;
2951} 3433}
2952 3434
2953############################################################################# 3435#############################################################################
2954 3436
2955package CFClient::UI::Face; 3437package CFPlus::UI::Face;
2956 3438
2957our @ISA = CFClient::UI::Base::; 3439our @ISA = CFPlus::UI::DrawBG::;
2958 3440
2959use CFClient::OpenGL; 3441use CFPlus::OpenGL;
2960 3442
2961sub new { 3443sub new {
2962 my $class = shift; 3444 my $class = shift;
2963 3445
2964 my $self = $class->SUPER::new ( 3446 my $self = $class->SUPER::new (
3447 size_w => 32,
3448 size_h => 8,
2965 aspect => 1, 3449 aspect => 1,
2966 can_events => 0, 3450 can_events => 0,
2967 @_, 3451 @_,
2968 ); 3452 );
2969 3453
2970 if ($self->{anim} && $self->{animspeed}) { 3454 if ($self->{anim} && $self->{animspeed}) {
2971 Scalar::Util::weaken (my $widget = $self); 3455 CFPlus::weaken (my $widget = $self);
2972 3456
3457 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3458 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2973 $self->{timer} = Event->timer ( 3459 $self->{timer} = Event->timer (
2974 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975 hard => 1, 3460 parked => 1,
2976 interval => $self->{animspeed},
2977 cb => sub { 3461 cb => sub {
3462 return unless $::CONN && $widget;
3463
2978 ++$widget->{frame}; 3464 ++$widget->{frame};
3465 $widget->update_face;
2979 $widget->update; 3466 $widget->update;
3467
3468 $widget->update_timer;
2980 }, 3469 },
2981 ); 3470 );
3471
3472 $self->update_face;
3473 $self->update_timer;
2982 } 3474 }
2983 3475
2984 $self 3476 $self
2985} 3477}
2986 3478
3479sub update_timer {
3480 my ($self) = @_;
3481
3482 return unless $self->{timer};
3483
3484 if ($self->{visible}) {
3485 $self->{timer}->at (
3486 $self->{anim_start}
3487 + $self->{animspeed}
3488 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3489 );
3490 $self->{timer}->start;
3491 } else {
3492 $self->{timer}->stop;
3493 }
3494}
3495
3496sub update_face {
3497 my ($self) = @_;
3498
3499 return unless $::CONN;
3500
3501 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3502 if ($anim && @$anim) {
3503 delete $self->{wait_face};
3504 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3505 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3506 }
3507 }
3508}
3509
2987sub size_request { 3510sub size_request {
2988 (32, 8) 3511 my ($self) = @_;
3512
3513 if ($::CONN) {
3514 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3515 if (my $tex = $::CONN->{texture}[$faceid]) {
3516 $self->{tex} = $tex;
3517 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3518 } else {
3519 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3520 $self->realloc;
3521 });
3522 }
3523 }
3524 }
3525
3526 ($self->{size_w} || 8, $self->{size_h} || 8)
2989} 3527}
2990 3528
2991sub update { 3529sub update {
2992 my ($self) = @_; 3530 my ($self) = @_;
2993 3531
2994 return unless $self->{visible}; 3532 return unless $self->{visible};
2995 3533
2996 $self->SUPER::update; 3534 $self->SUPER::update;
2997} 3535}
2998 3536
3537sub invoke_visibility_change {
3538 my ($self) = @_;
3539
3540 $self->update_timer;
3541
3542 0
3543}
3544
2999sub _draw { 3545sub _draw {
3000 my ($self) = @_; 3546 my ($self) = @_;
3001 3547
3002 return unless $::CONN; 3548 $self->SUPER::_draw;
3003 3549
3004 my $face; 3550 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; 3551 glEnable GL_TEXTURE_2D;
3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3018 glColor 0, 0, 0, 1; 3553 glColor 0, 0, 0, 1;
3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3554 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3020 glDisable GL_TEXTURE_2D; 3555 glDisable GL_TEXTURE_2D;
… …
3022} 3557}
3023 3558
3024sub destroy { 3559sub destroy {
3025 my ($self) = @_; 3560 my ($self) = @_;
3026 3561
3027 $self->{timer}->cancel 3562 (delete $self->{timer})->cancel
3028 if $self->{timer}; 3563 if $self->{timer};
3029 3564
3030 $self->SUPER::destroy; 3565 $self->SUPER::destroy;
3031} 3566}
3032 3567
3033############################################################################# 3568#############################################################################
3034 3569
3035package CFClient::UI::Buttonbar; 3570package CFPlus::UI::Buttonbar;
3036 3571
3037our @ISA = CFClient::UI::HBox::; 3572our @ISA = CFPlus::UI::HBox::;
3038 3573
3039# TODO: should actualyl wrap buttons and other goodies. 3574# TODO: should actually wrap buttons and other goodies.
3040 3575
3041############################################################################# 3576#############################################################################
3042 3577
3043package CFClient::UI::Menu; 3578package CFPlus::UI::Menu;
3044 3579
3045our @ISA = CFClient::UI::FancyFrame::; 3580our @ISA = CFPlus::UI::Toplevel::;
3046 3581
3047use CFClient::OpenGL; 3582use CFPlus::OpenGL;
3048 3583
3049sub new { 3584sub new {
3050 my $class = shift; 3585 my $class = shift;
3051 3586
3052 my $self = $class->SUPER::new ( 3587 my $self = $class->SUPER::new (
3053 items => [], 3588 items => [],
3054 z => 100, 3589 z => 100,
3055 @_, 3590 @_,
3056 ); 3591 );
3057 3592
3058 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3593 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059 3594
3060 for my $item (@{ $self->{items} }) { 3595 for my $item (@{ $self->{items} }) {
3061 my ($widget, $cb, $tooltip) = @$item; 3596 my ($widget, $cb, $tooltip) = @$item;
3062 3597
3063 # handle various types of items, only text for now 3598 # handle various types of items, only text for now
3064 if (!ref $widget) { 3599 if (!ref $widget) {
3600 if ($widget =~ /\t/) {
3601 my ($left, $right) = split /\t/, $widget, 2;
3602
3065 $widget = new CFClient::UI::Label 3603 $widget = new CFPlus::UI::HBox
3066 can_hover => 1, 3604 can_hover => 1,
3067 can_events => 1, 3605 can_events => 1,
3606 tooltip => $tooltip,
3607 children => [
3608 (new CFPlus::UI::Label markup => $left, expand => 1),
3609 (new CFPlus::UI::Label markup => $right, align => +1),
3610 ],
3611 ;
3612
3613 } else {
3614 $widget = new CFPlus::UI::Label
3615 can_hover => 1,
3616 can_events => 1,
3068 markup => $widget, 3617 markup => $widget,
3069 tooltip => $tooltip 3618 tooltip => $tooltip;
3619 }
3070 } 3620 }
3071 3621
3072 $self->{item}{$widget} = $item; 3622 $self->{item}{$widget} = $item;
3073 3623
3074 $self->{vbox}->add ($widget); 3624 $self->{vbox}->add ($widget);
… …
3117 1 3667 1
3118} 3668}
3119 3669
3120############################################################################# 3670#############################################################################
3121 3671
3122package CFClient::UI::Multiplexer; 3672package CFPlus::UI::Multiplexer;
3123 3673
3124our @ISA = CFClient::UI::Container::; 3674our @ISA = CFPlus::UI::Container::;
3125 3675
3126sub new { 3676sub new {
3127 my $class = shift; 3677 my $class = shift;
3128 3678
3129 my $self = $class->SUPER::new ( 3679 my $self = $class->SUPER::new (
… …
3143 3693
3144 $self->{current} = $self->{children}[0] 3694 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3695 if @{ $self->{children} };
3146} 3696}
3147 3697
3698sub get_current_page {
3699 my ($self) = @_;
3700
3701 $self->{current}
3702}
3703
3148sub set_current_page { 3704sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3705 my ($self, $page_or_widget) = @_;
3150 3706
3151 my $widget = ref $page_or_widget 3707 my $widget = ref $page_or_widget
3152 ? $page_or_widget 3708 ? $page_or_widget
… …
3184 $self->{current}->draw; 3740 $self->{current}->draw;
3185} 3741}
3186 3742
3187############################################################################# 3743#############################################################################
3188 3744
3189package CFClient::UI::Notebook; 3745package CFPlus::UI::Notebook;
3190 3746
3191our @ISA = CFClient::UI::VBox::; 3747our @ISA = CFPlus::UI::VBox::;
3192 3748
3193sub new { 3749sub new {
3194 my $class = shift; 3750 my $class = shift;
3195 3751
3196 my $self = $class->SUPER::new ( 3752 my $self = $class->SUPER::new (
3197 buttonbar => (new CFClient::UI::Buttonbar), 3753 buttonbar => (new CFPlus::UI::Buttonbar),
3198 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3754 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199 # filter => # will be put between multiplexer and $self 3755 # filter => # will be put between multiplexer and $self
3200 @_, 3756 @_,
3201 ); 3757 );
3202 3758
3203 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3759 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3207} 3763}
3208 3764
3209sub add { 3765sub add {
3210 my ($self, $title, $widget, $tooltip) = @_; 3766 my ($self, $title, $widget, $tooltip) = @_;
3211 3767
3212 Scalar::Util::weaken $self; 3768 CFPlus::weaken $self;
3213 3769
3214 $self->{buttonbar}->add (new CFClient::UI::Button 3770 $self->{buttonbar}->add (new CFPlus::UI::Button
3215 markup => $title, 3771 markup => $title,
3216 tooltip => $tooltip, 3772 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) }, 3773 on_activate => sub { $self->set_current_page ($widget) },
3218 ); 3774 );
3219 3775
3220 $self->{multiplexer}->add ($widget); 3776 $self->{multiplexer}->add ($widget);
3221} 3777}
3222 3778
3779sub get_current_page {
3780 my ($self) = @_;
3781
3782 $self->{multiplexer}->get_current_page
3783}
3784
3223sub set_current_page { 3785sub set_current_page {
3224 my ($self, $page) = @_; 3786 my ($self, $page) = @_;
3225 3787
3226 $self->{multiplexer}->set_current_page ($page); 3788 $self->{multiplexer}->set_current_page ($page);
3227 $self->emit (page_changed => $self->{multiplexer}{current}); 3789 $self->emit (page_changed => $self->{multiplexer}{current});
3228} 3790}
3229 3791
3230############################################################################# 3792#############################################################################
3231 3793
3232package CFClient::UI::Combobox; 3794package CFPlus::UI::Selector;
3233 3795
3234use utf8; 3796use utf8;
3235 3797
3236our @ISA = CFClient::UI::Button::; 3798our @ISA = CFPlus::UI::Button::;
3237 3799
3238sub new { 3800sub new {
3239 my $class = shift; 3801 my $class = shift;
3240 3802
3241 my $self = $class->SUPER::new ( 3803 my $self = $class->SUPER::new (
… …
3258 my ($value, $title, $tooltip) = @$_; 3820 my ($value, $title, $tooltip) = @$_;
3259 3821
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3822 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 } 3823 }
3262 3824
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3825 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264} 3826}
3265 3827
3266sub _set_value { 3828sub _set_value {
3267 my ($self, $value) = @_; 3829 my ($self, $value) = @_;
3268 3830
… …
3283 $self->emit (changed => $value); 3845 $self->emit (changed => $value);
3284} 3846}
3285 3847
3286############################################################################# 3848#############################################################################
3287 3849
3288package CFClient::UI::Statusbox; 3850package CFPlus::UI::Statusbox;
3289 3851
3290our @ISA = CFClient::UI::VBox::; 3852our @ISA = CFPlus::UI::VBox::;
3291 3853
3292sub new { 3854sub new {
3293 my $class = shift; 3855 my $class = shift;
3294 3856
3295 my $self = $class->SUPER::new ( 3857 my $self = $class->SUPER::new (
3296 fontsize => 0.8, 3858 fontsize => 0.8,
3297 @_, 3859 @_,
3298 ); 3860 );
3299 3861
3300 Scalar::Util::weaken (my $this = $self); 3862 CFPlus::weaken (my $this = $self);
3301 3863
3302 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3864 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303 3865
3304 $self 3866 $self
3305} 3867}
… …
3307sub reorder { 3869sub reorder {
3308 my ($self) = @_; 3870 my ($self) = @_;
3309 my $NOW = Time::HiRes::time; 3871 my $NOW = Time::HiRes::time;
3310 3872
3311 # freeze display when hovering over any label 3873 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner} 3874 return if $CFPlus::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3875 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} }; 3876 values %{ $self->{item} };
3315 3877
3316 while (my ($k, $v) = each %{ $self->{item} }) { 3878 while (my ($k, $v) = each %{ $self->{item} }) {
3317 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3879 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318 } 3880 }
… …
3339 for ($short) { 3901 for ($short) {
3340 s/^\s+//; 3902 s/^\s+//;
3341 s/\s+/ /g; 3903 s/\s+/ /g;
3342 } 3904 }
3343 3905
3344 new CFClient::UI::Label 3906 new CFPlus::UI::Label
3345 markup => $short, 3907 markup => $short,
3346 tooltip => $item->{tooltip}, 3908 tooltip => $item->{tooltip},
3347 tooltip_font => $::FONT_PROP, 3909 tooltip_font => $::FONT_PROP,
3348 tooltip_width => 0.67, 3910 tooltip_width => 0.67,
3349 fontsize => $item->{fontsize} || $self->{fontsize}, 3911 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3403 count => 1, 3965 count => 1,
3404 %arg, 3966 %arg,
3405 }; 3967 };
3406 } 3968 }
3407 3969
3970 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 3971 $self->reorder;
3972 });
3409} 3973}
3410 3974
3411sub reconfigure { 3975sub reconfigure {
3412 my ($self) = @_; 3976 my ($self) = @_;
3413 3977
… …
3426 $self->SUPER::destroy; 3990 $self->SUPER::destroy;
3427} 3991}
3428 3992
3429############################################################################# 3993#############################################################################
3430 3994
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; 3995package CFPlus::UI::Root;
3804 3996
3805our @ISA = CFClient::UI::Container::; 3997our @ISA = CFPlus::UI::Container::;
3806 3998
3807use List::Util qw(min max); 3999use List::Util qw(min max);
3808 4000
3809use CFClient::OpenGL; 4001use CFPlus::OpenGL;
3810 4002
3811sub new { 4003sub new {
3812 my $class = shift; 4004 my $class = shift;
3813 4005
3814 my $self = $class->SUPER::new ( 4006 my $self = $class->SUPER::new (
3815 visible => 1, 4007 visible => 1,
3816 @_, 4008 @_,
3817 ); 4009 );
3818 4010
3819 Scalar::Util::weaken ($self->{root} = $self); 4011 CFPlus::weaken ($self->{root} = $self);
3820 4012
3821 $self 4013 $self
3822} 4014}
3823 4015
3824sub size_request { 4016sub size_request {
… …
3919 while ($self->{refresh_hook}) { 4111 while ($self->{refresh_hook}) {
3920 $_->() 4112 $_->()
3921 for values %{delete $self->{refresh_hook}}; 4113 for values %{delete $self->{refresh_hook}};
3922 } 4114 }
3923 4115
3924 if ($self->{realloc}) { 4116 while ($self->{realloc}) {
3925 my %queue; 4117 my %queue;
3926 my @queue; 4118 my @queue;
3927 my $widget; 4119 my $widget;
3928 4120
3929 outer: 4121 outer:
… …
3976 } 4168 }
3977 } 4169 }
3978 4170
3979 delete $self->{realloc}{$widget+0}; 4171 delete $self->{realloc}{$widget+0};
3980 } 4172 }
3981 }
3982 4173
3983 while (my $size_alloc = delete $self->{size_alloc}) { 4174 while (my $size_alloc = delete $self->{size_alloc}) {
3984 my @queue = sort { $b->{visible} <=> $a->{visible} } 4175 my @queue = sort { $a->{visible} <=> $b->{visible} }
3985 values %$size_alloc; 4176 values %$size_alloc;
3986 4177
3987 while () { 4178 while () {
3988 my $widget = pop @queue || last; 4179 my $widget = pop @queue || last;
3989 4180
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4181 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991 4182
3992 $w = 0 if $w < 0; 4183 $w = max $widget->{min_w}, $w;
3993 $h = 0 if $h < 0; 4184 $h = max $widget->{min_h}, $h;
3994 4185
4186# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4187# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4188
4189 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4190 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4191
3995 $w = int $w + 0.5; 4192 $w = int $w + 0.5;
3996 $h = int $h + 0.5; 4193 $h = int $h + 0.5;
3997 4194
3998 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4195 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999 $widget->{old_w} = $widget->{w}; 4196 $widget->{old_w} = $widget->{w};
4000 $widget->{old_h} = $widget->{h}; 4197 $widget->{old_h} = $widget->{h};
4001 4198
4002 $widget->{w} = $w; 4199 $widget->{w} = $w;
4003 $widget->{h} = $h; 4200 $widget->{h} = $h;
4004 4201
4005 $widget->emit (size_allocate => $w, $h); 4202 $widget->emit (size_allocate => $w, $h);
4203 }
4006 } 4204 }
4007 } 4205 }
4008 } 4206 }
4009 4207
4010 while ($self->{post_alloc_hook}) { 4208 while ($self->{post_alloc_hook}) {
4011 $_->() 4209 $_->()
4012 for values %{delete $self->{post_alloc_hook}}; 4210 for values %{delete $self->{post_alloc_hook}};
4013 } 4211 }
4014
4015 4212
4016 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4213 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4017 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4214 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4018 glClear GL_COLOR_BUFFER_BIT; 4215 glClear GL_COLOR_BUFFER_BIT;
4019 4216
… …
4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023 glMatrixMode GL_MODELVIEW; 4220 glMatrixMode GL_MODELVIEW;
4024 glLoadIdentity; 4221 glLoadIdentity;
4025 4222
4026 { 4223 {
4027 package CFClient::UI::Base; 4224 package CFPlus::UI::Base;
4028 4225
4029 ($draw_x, $draw_y, $draw_w, $draw_h) = 4226 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030 (0, 0, $self->{w}, $self->{h}); 4227 (0, 0, $self->{w}, $self->{h});
4031 }
4032 4228
4033 $self->_draw; 4229 $self->_draw;
4230 }
4034} 4231}
4035 4232
4036############################################################################# 4233#############################################################################
4037 4234
4038package CFClient::UI; 4235package CFPlus::UI;
4039 4236
4040$ROOT = new CFClient::UI::Root; 4237$ROOT = new CFPlus::UI::Root;
4041$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4238$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042 4239
40431 42401
4044 4241

Diff Legend

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