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

Diff Legend

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