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.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.408 by root, Sun Jul 22 15:26:01 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98 120
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
101} 129}
102 130
103sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
104 my ($ev) = @_; 132 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 133
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 135
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 137
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
112 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 140
114 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 143 $grab->update if $grab;
117 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
118 145
146 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 147 $TOOLTIP_WATCHER->cb->();
120 } 148 }
121} 149}
122 150
123sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
124 my ($ev) = @_; 152 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
126 154
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 156
129 if ($widget != $HOVER) { 157 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 158
132 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 160 if $HOVER;
140} 161}
141 162
142# convert position array to integers 163# convert position array to integers
143sub harmonize { 164sub harmonize {
… …
193 reconfigure_widgets; 214 reconfigure_widgets;
194} 215}
195 216
196############################################################################# 217#############################################################################
197 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
198package CFClient::UI::Base; 227package CFPlus::UI::Base;
199 228
200use strict; 229use strict;
201 230
202use CFClient::OpenGL; 231use CFPlus::OpenGL;
203 232
204sub new { 233sub new {
205 my $class = shift; 234 my $class = shift;
206 235
207 my $self = bless { 236 my $self = bless {
… …
212 h => undef, 241 h => undef,
213 can_events => 1, 242 can_events => 1,
214 @_ 243 @_
215 }, $class; 244 }, $class;
216 245
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 247
219 for (keys %$self) { 248 for (keys %$self) {
220 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
222 } 251 }
223 } 252 }
224 253
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 259
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 262
234 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
239 268
240sub destroy { 269sub destroy {
241 my ($self) = @_; 270 my ($self) = @_;
242 271
243 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
244 %$self = (); 274 %$self = ();
245} 275}
246 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
247sub show { 281sub show {
248 my ($self) = @_; 282 my ($self) = @_;
249 283
250 return if $self->{parent}; 284 return if $self->{parent};
251 285
252 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
253} 287}
254 288
255sub set_visible { 289sub set_visible {
256 my ($self) = @_; 290 my ($self) = @_;
257 291
… …
278 delete $self->{root}; 312 delete $self->{root};
279 313
280 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
282 316
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
285 319
286 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
… …
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
335sub size_request { 369sub size_request {
336 require Carp; 370 require Carp;
337 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
338} 372}
339 373
374sub baseline_shift {
375 0
376}
377
340sub configure { 378sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
342 380
343 if ($self->{aspect}) { 381 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
345 383
346 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 386
349 # use alignment to adjust x, y 387 # use alignment to adjust x, y
350 388
351 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
393 431
394 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
395 433
396 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
397 435
398 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
400 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
401 } 439 }
402} 440}
403 441
404# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
405sub coord2local { 443sub coord2local {
406 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
407 445
446 Carp::confess unless $self->{parent};#d#
447
408 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409} 449}
410 450
411# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
412sub coord2global { 452sub coord2global {
413 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
414 454
455 Carp::confess unless $self->{parent};#d#
456
415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416} 458}
417 459
418sub invoke_focus_in { 460sub invoke_focus_in {
419 my ($self) = @_; 461 my ($self) = @_;
420 462
421 return if $FOCUS == $self; 463 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
423 465
424 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
425 467
426 $focus->update if $focus; 468 $self->update;
427 $FOCUS->update;
428 469
429 0 470 0
430} 471}
431 472
432sub invoke_focus_out { 473sub invoke_focus_out {
433 my ($self) = @_; 474 my ($self) = @_;
434 475
435 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
436 477
437 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
438 479
439 $focus->update if $focus; #? 480 $self->update;
440 481
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 483 unless $FOCUS;
443 484
444 0 485 0
445} 486}
446 487
447sub grab_focus { 488sub grab_focus {
448 my ($self) = @_; 489 my ($self) = @_;
449 490
491 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 492 $self->emit ("focus_in");
451} 493}
452 494
453sub invoke_mouse_motion { 1 } 495sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 496sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 497sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
457 500
458sub invoke_button_down { 501sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
460 503
461 $self->grab_focus; 504 $self->grab_focus;
462 505
463 1 506 0
464} 507}
465 508
466sub connect { 509sub connect {
467 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
468 511
469 push @{ $self->{signal_cb}{$signal} }, $cb; 512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
470} 518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
471 532
472sub emit { 533sub emit {
473 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
474 535
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before 536 # I do not really like this solution, but I do not like duplication
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
476 ($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
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
478} 554}
479 555
480sub find_widget { 556#sub find_widget {
481 my ($self, $x, $y) = @_; 557# in .xs
482
483 return () unless $self->{can_events};
484
485 return $self
486 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
487 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
488
489 ()
490}
491 558
492sub set_parent { 559sub set_parent {
493 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
494 561
495 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
496 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
497} 564}
498 565
499sub realloc { 566sub realloc {
500 my ($self) = @_; 567 my ($self) = @_;
… …
526 593
527# 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
528# functions seems pointless. 595# functions seems pointless.
529our ($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
530 597
531sub draw { 598#sub draw {
532 my ($self) = @_; 599#CFPlus.xs
533
534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545
546 glPushMatrix;
547 glTranslate $self->{x}, $self->{y}, 0;
548
549 if ($self == $HOVER && $self->{can_hover}) {
550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
551 glEnable GL_BLEND;
552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
553 glBegin GL_QUADS;
554 glVertex 0 , 0;
555 glVertex $self->{w}, 0;
556 glVertex $self->{w}, $self->{h};
557 glVertex 0 , $self->{h};
558 glEnd;
559 glDisable GL_BLEND;
560 }
561
562 if ($ENV{CFPLUS_DEBUG} & 1) {
563 glPushMatrix;
564 glColor 1, 1, 0, 1;
565 glTranslate 0.375, 0.375;
566 glBegin GL_LINE_LOOP;
567 glVertex 0 , 0;
568 glVertex $self->{w} - 1, 0;
569 glVertex $self->{w} - 1, $self->{h} - 1;
570 glVertex 0 , $self->{h} - 1;
571 glEnd;
572 glPopMatrix;
573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
574 }
575
576 $self->_draw;
577 glPopMatrix;
578}
579 600
580sub _draw { 601sub _draw {
581 my ($self) = @_; 602 my ($self) = @_;
582 603
583 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
584} 605}
585 606
586sub DESTROY { 607sub DESTROY {
587 my ($self) = @_; 608 my ($self) = @_;
588 609
589 delete $WIDGET{$self+0}; 610 return if CFPlus::in_destruct;
590 611
591 eval { $self->destroy }; 612 eval { $self->destroy };
592 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};
593} 616}
594 617
595############################################################################# 618#############################################################################
596 619
597package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
598 621
599our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
600 623
601use strict; 624use strict;
602use CFClient::OpenGL; 625use CFPlus::OpenGL;
603 626
604sub new { 627sub new {
605 my $class = shift; 628 my $class = shift;
606 629
607 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
638 } 661 }
639} 662}
640 663
641############################################################################# 664#############################################################################
642 665
643package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
644 667
645our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
646 669
647sub new { 670sub new {
648 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
649 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
650} 673}
… …
657 680
658sub draw { } 681sub draw { }
659 682
660############################################################################# 683#############################################################################
661 684
662package CFClient::UI::Container; 685package CFPlus::UI::Container;
663 686
664our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
665 688
666sub new { 689sub new {
667 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
668 691
669 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
673 can_events => 0, 696 can_events => 0,
674 %arg, 697 %arg,
675 ); 698 );
676 699
677 $self->add (@$children) 700 $self->add (@$children)
678 if $children; 701 if $children && @$children;
679 702
680 $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;
681} 712}
682 713
683sub add { 714sub add {
684 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
685 716
686 $_->set_parent ($self) 717 $_->set_parent ($self)
687 for @widgets; 718 for @widgets;
688 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
689 use sort 'stable'; 721 use sort 'stable';
690 722
691 $self->{children} = [ 723 $self->{children} = [
692 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
693 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
694 ]; 726 ];
695 727
696 $self->realloc; 728 $self->realloc;
729
730 map $_+0, @widgets
697} 731}
698 732
699sub children { 733sub children {
700 @{ $_[0]{children} } 734 @{ $_[0]{children} }
701} 735}
… …
712} 746}
713 747
714sub clear { 748sub clear {
715 my ($self) = @_; 749 my ($self) = @_;
716 750
717 my $children = delete $self->{children}; 751 my $children = $self->{children};
718 $self->{children} = []; 752 $self->{children} = [];
719 753
720 for (@$children) { 754 for (@$children) {
721 delete $_->{parent}; 755 delete $_->{parent};
722 $_->hide; 756 $_->hide;
… …
747 $_->draw for @{$self->{children}}; 781 $_->draw for @{$self->{children}};
748} 782}
749 783
750############################################################################# 784#############################################################################
751 785
752package CFClient::UI::Bin; 786package CFPlus::UI::Bin;
753 787
754our @ISA = CFClient::UI::Container::; 788our @ISA = CFPlus::UI::Container::;
755 789
756sub new { 790sub new {
757 my ($class, %arg) = @_; 791 my ($class, %arg) = @_;
758 792
759 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760 794
761 $class->SUPER::new (children => [$child], %arg) 795 $class->SUPER::new (children => [$child], %arg)
762} 796}
763 797
764sub add { 798sub add {
… …
771sub remove { 805sub remove {
772 my ($self, $widget) = @_; 806 my ($self, $widget) = @_;
773 807
774 $self->SUPER::remove ($widget); 808 $self->SUPER::remove ($widget);
775 809
776 $self->{children} = [new CFClient::UI::Empty] 810 $self->{children} = [new CFPlus::UI::Empty]
777 unless @{$self->{children}}; 811 unless @{$self->{children}};
778} 812}
779 813
780sub child { $_[0]->{children}[0] } 814sub child { $_[0]->{children}[0] }
781 815
… …
793 827
794############################################################################# 828#############################################################################
795 829
796# back-buffered drawing area 830# back-buffered drawing area
797 831
798package CFClient::UI::Window; 832package CFPlus::UI::Window;
799 833
800our @ISA = CFClient::UI::Bin::; 834our @ISA = CFPlus::UI::Bin::;
801 835
802use CFClient::OpenGL; 836use CFPlus::OpenGL;
803 837
804sub new { 838sub new {
805 my ($class, %arg) = @_; 839 my ($class, %arg) = @_;
806 840
807 my $self = $class->SUPER::new (%arg); 841 my $self = $class->SUPER::new (%arg);
… …
829} 863}
830 864
831sub render_child { 865sub render_child {
832 my ($self) = @_; 866 my ($self) = @_;
833 867
834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
835 glClearColor 0, 0, 0, 0; 869 glClearColor 0, 0, 0, 0;
836 glClear GL_COLOR_BUFFER_BIT; 870 glClear GL_COLOR_BUFFER_BIT;
837 871
838 { 872 {
839 package CFClient::UI::Base; 873 package CFPlus::UI::Base;
840 874
841 ($draw_x, $draw_y, $draw_w, $draw_h) = 875 local ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h}); 876 (0, 0, $self->{w}, $self->{h});
877
878 $self->_render;
843 } 879 }
844
845 $self->_render;
846 }; 880 };
847} 881}
848 882
849sub _draw { 883sub _draw {
850 my ($self) = @_; 884 my ($self) = @_;
851
852 my ($w, $h) = @$self{qw(w h)};
853 885
854 my $tex = $self->{texture} 886 my $tex = $self->{texture}
855 or return; 887 or return;
856 888
857 glEnable GL_TEXTURE_2D; 889 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 0, 0, 0, 1; 891 glColor 0, 0, 0, 1;
860 892
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 893 $tex->draw_quad_alpha_premultiplied (0, 0);
862 894
863 glDisable GL_TEXTURE_2D; 895 glDisable GL_TEXTURE_2D;
864} 896}
865 897
866############################################################################# 898#############################################################################
867 899
868package CFClient::UI::ViewPort; 900package CFPlus::UI::ViewPort;
869 901
902use List::Util qw(min max);
903
870our @ISA = CFClient::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
871 905
872sub new { 906sub new {
873 my $class = shift; 907 my $class = shift;
874 908
875 $class->SUPER::new ( 909 $class->SUPER::new (
… …
882sub size_request { 916sub size_request {
883 my ($self) = @_; 917 my ($self) = @_;
884 918
885 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
886 920
887 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
889 923
890 ($w, $h) 924 ($w, $h)
891} 925}
892 926
893sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
905} 939}
906 940
907sub set_offset { 941sub set_offset {
908 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
909 943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
910 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
911 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
912 950
951 $self->emit (changed => $x, $y);
913 $self->update; 952 $self->update;
953 }
914} 954}
915 955
916# hmm, this does not work for topleft of $self... but we should not ask for that 956# hmm, this does not work for topleft of $self... but we should not ask for that
917sub coord2local { 957sub coord2local {
918 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
933 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
934 974
935 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
937 ) { 977 ) {
938 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939 } else { 979 } else {
940 $self->CFClient::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
941 } 981 }
942} 982}
943 983
944sub _render { 984sub _render {
945 my ($self) = @_; 985 my ($self) = @_;
946 986
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 987 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
949 989
950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951 991
952 $self->SUPER::_render; 992 $self->SUPER::_render;
953} 993}
954 994
955############################################################################# 995#############################################################################
956 996
957package CFClient::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
958 998
959our @ISA = CFClient::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
960 1000
961sub new { 1001sub new {
962 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
963 1003
964 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
965 1005
966 my $self; 1006 my $self;
967 1007
968 my $slider = new CFClient::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1011 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub {
1014 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 },
1017 ;
1018
1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
969 vertical => 1, 1022 vertical => 1,
970 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
971 on_changed => sub { 1024 on_changed => sub {
972 $self->{vp}->set_offset (0, $_[1]); 1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
973 }, 1027 },
974 ; 1028 ;
975 1029
976 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
977 vp => (new CFClient::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1033 can_events => 1,
978 slider => $slider, 1034 hslider => $hslider,
1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
979 %arg, 1038 %arg,
980 ); 1039 );
981 1040
1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1044 expand => 1,
1045 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1060 ;
1061
982 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp});
1063
983 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
984 1065
985 $self 1066 $self
986} 1067}
987 1068
… …
989 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
990 1071
991 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
992} 1073}
993 1074
994sub update { 1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
995 my ($self) = @_; 1106 my ($self, $ev) = @_;
996 1107
997 $self->SUPER::update; 1108 $self->grab_focus;
998 1109
999 # todo: overwrite size_allocate of child 1110 my $ox = $self->{vp}{view_x};
1000 my $child = $self->{vp}->child; 1111 my $oy = $self->{vp}{view_y};
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1120 };
1121}
1122
1123sub invoke_mouse_wheel {
1124 my ($self, $ev) = @_;
1125
1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1128
1129 1
1130}
1131
1132sub invoke_button_down {
1133 my ($self, $ev, $x, $y) = @_;
1134
1135 if ($ev->{button} == 2) {
1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1139
1140 0
1141}
1142
1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1145
1146 if (delete $self->{motion}) {
1147 return 1;
1148 }
1149
1150 0
1151}
1152
1153sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_;
1155
1156 if ($self->{motion}) {
1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1160
1161 0
1002} 1162}
1003 1163
1004sub invoke_size_allocate { 1164sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1006 1166
1007 my $child = $self->{vp}->child; 1167 $self->update_slider;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h) 1168 $self->SUPER::invoke_size_allocate ($w, $h)
1011} 1169}
1012 1170
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015
1016############################################################################# 1171#############################################################################
1017 1172
1018package CFClient::UI::Frame; 1173package CFPlus::UI::Frame;
1019 1174
1020our @ISA = CFClient::UI::Bin::; 1175our @ISA = CFPlus::UI::Bin::;
1021 1176
1022use CFClient::OpenGL; 1177use CFPlus::OpenGL;
1023 1178
1024sub new { 1179sub new {
1025 my $class = shift; 1180 my $class = shift;
1026 1181
1027 $class->SUPER::new ( 1182 $class->SUPER::new (
… …
1053 $self->SUPER::_draw; 1208 $self->SUPER::_draw;
1054} 1209}
1055 1210
1056############################################################################# 1211#############################################################################
1057 1212
1058package CFClient::UI::FancyFrame; 1213package CFPlus::UI::FancyFrame;
1059 1214
1060our @ISA = CFClient::UI::Bin::; 1215our @ISA = CFPlus::UI::Bin::;
1061 1216
1062use CFClient::OpenGL; 1217use CFPlus::OpenGL;
1218
1219sub new {
1220 my ($class, %arg) = @_;
1221
1222 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label
1224 align => 1,
1225 valign => 0,
1226 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75;
1228 }
1229
1230 my $self = $class->SUPER::new (
1231 # label => "",
1232 fg => [0.6, 0.3, 0.1],
1233 border => 0.8,
1234 style => 'single',
1235 %arg,
1236 );
1237
1238 $self
1239}
1240
1241sub add {
1242 my ($self, @widgets) = @_;
1243
1244 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1246}
1247
1248sub border {
1249 int $_[0]{border} * $::FONTSIZE
1250}
1251
1252sub size_request {
1253 my ($self) = @_;
1254
1255 ($self->{label_w}, undef) = $self->{label}->size_request
1256 if $self->{label};
1257
1258 my ($w, $h) = $self->SUPER::size_request;
1259
1260 (
1261 $w + $self->border * 2,
1262 $h + $self->border * 2,
1263 )
1264}
1265
1266sub invoke_size_allocate {
1267 my ($self, $w, $h) = @_;
1268
1269 my $border = $self->border;
1270
1271 $w -= List::Util::max 0, $border * 2;
1272 $h -= List::Util::max 0, $border * 2;
1273
1274 if (my $label = $self->{label}) {
1275 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1276 $label->{h} = List::Util::min $h, $border;
1277 $label->invoke_size_allocate ($label->{w}, $label->{h});
1278 }
1279
1280 $self->child->configure ($border, $border, $w, $h);
1281
1282 1
1283}
1284
1285sub _draw {
1286 my ($self) = @_;
1287
1288 my $child = $self->{children}[0];
1289
1290 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h});
1292
1293 $child->draw;
1294
1295 glColor @{$self->{fg}};
1296 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1301 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1302 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1303 glEnd;
1304
1305 if ($self->{label}) {
1306 glTranslate $border * 2, 0;
1307 $self->{label}->_draw;
1308 }
1309}
1310
1311#############################################################################
1312
1313package CFPlus::UI::Toplevel;
1314
1315our @ISA = CFPlus::UI::Bin::;
1316
1317use CFPlus::OpenGL;
1063 1318
1064my $bg = 1319my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1; 1321 mipmap => 1, wrap => 1;
1067 1322
1068my @border = 1323my @border =
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1071 1330
1072sub new { 1331sub new {
1073 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1074 1333
1075 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1335 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1336 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1337 border => 0.6,
1079 can_events => 1, 1338 can_events => 1,
1080 min_w => 16, 1339 min_w => 64,
1081 min_h => 16, 1340 min_h => 32,
1082 %arg, 1341 %arg,
1083 ); 1342 );
1084 1343
1085 $self->{title_widget} = new CFClient::UI::Label 1344 $self->{title_widget} = new CFPlus::UI::Label
1086 align => 0, 1345 align => 0,
1087 valign => 1, 1346 valign => 1,
1088 text => $self->{title}, 1347 text => $self->{title},
1089 fontsize => $self->{border}, 1348 fontsize => $self->{border},
1090 if exists $self->{title}; 1349 if exists $self->{title};
1091 1350
1092 if ($self->{has_close_button}) { 1351 if ($self->{has_close_button}) {
1093 $self->{close_button} = 1352 $self->{close_button} =
1094 new CFClient::UI::ImageButton 1353 new CFPlus::UI::ImageButton
1095 image => 'x1_close.png', 1354 path => 'x1_close.png',
1096 on_activate => sub { $self->hide }; 1355 on_activate => sub { $self->emit ("delete") };
1097 1356
1098 $self->CFClient::UI::Container::add ($self->{close_button}); 1357 $self->CFPlus::UI::Container::add ($self->{close_button});
1099 } 1358 }
1100 1359
1101 $self 1360 $self
1102} 1361}
1103 1362
1104sub add { 1363sub add {
1105 my ($self, @widgets) = @_; 1364 my ($self, @widgets) = @_;
1106 1365
1107 $self->SUPER::add (@widgets); 1366 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1367 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110} 1369}
1111 1370
1112sub border { 1371sub border {
1113 int $_[0]{border} * $::FONTSIZE 1372 int $_[0]{border} * $::FONTSIZE
1114} 1373}
… …
1147 $self->child->configure ($border, $border, $w, $h); 1406 $self->child->configure ($border, $border, $w, $h);
1148 1407
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1408 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button}; 1409 if $self->{close_button};
1151 1410
1411 1
1412}
1413
1414sub invoke_delete {
1415 my ($self) = @_;
1416
1417 $self->hide;
1418
1152 1 1419 1
1153} 1420}
1154 1421
1155sub invoke_button_down { 1422sub invoke_button_down {
1156 my ($self, $ev, $x, $y) = @_; 1423 my ($self, $ev, $x, $y) = @_;
… …
1214 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1481 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215 1482
1216 ! ! $self->{motion} 1483 ! ! $self->{motion}
1217} 1484}
1218 1485
1486sub invoke_visibility_change {
1487 my ($self, $visible) = @_;
1488
1489 delete $self->{motion} unless $visible;
1490
1491 0
1492}
1493
1219sub _draw { 1494sub _draw {
1220 my ($self) = @_; 1495 my ($self) = @_;
1221 1496
1222 my $child = $self->{children}[0]; 1497 my $child = $self->{children}[0];
1223 1498
… …
1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1229 1504
1230 my $border = $self->border; 1505 my $border = $self->border;
1231 1506
1232 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1233 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1234 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1235 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1236 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1237 1526
1238 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1239 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1240 1529
1241 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1260 if $self->{close_button}; 1549 if $self->{close_button};
1261} 1550}
1262 1551
1263############################################################################# 1552#############################################################################
1264 1553
1265package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1266 1555
1267our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1268 1557
1269use List::Util qw(max sum); 1558use List::Util qw(max sum);
1270 1559
1271use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1272 1561
1273sub new { 1562sub new {
1274 my $class = shift; 1563 my $class = shift;
1275 1564
1276 $class->SUPER::new ( 1565 $class->SUPER::new (
1277 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1278 @_, 1568 @_,
1279 ) 1569 )
1280} 1570}
1281 1571
1282sub children {
1283 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284}
1285
1286sub add { 1572sub add {
1287 my ($self, $x, $y, $child) = @_; 1573 my ($self, @widgets) = @_;
1288 1574
1289 $child->set_parent ($self); 1575 for my $child (@widgets) {
1290 $self->{children}[$y][$x] = $child; 1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1291 1579
1292 $self->realloc; 1580 $self->SUPER::add (@widgets);
1293} 1581}
1294 1582
1295sub remove { 1583sub add_at {
1584 my $self = shift;
1585
1586 my @widgets;
1587
1588 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1590
1591 $child->{row} = $row;
1592 $child->{col} = $col;
1593
1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1296 my ($self, $child) = @_; 1601 my ($self) = @_;
1297 1602
1298 # TODO: not yet implemented 1603 my (@w, @h);
1299}
1300
1301# TODO: move to container class maybe? send children a signal on removal?
1302sub clear {
1303 my ($self) = @_;
1304 1604
1305 my @children = $self->children; 1605 my @children = $self->children;
1306 delete $self->{children}; 1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1307 1616 }
1308 for (@children) {
1309 delete $_->{parent};
1310 $_->hide;
1311 }
1312 1617
1313 $self->realloc; 1618 # second pass, rows
1314} 1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1315
1316sub get_wh {
1317 my ($self) = @_;
1318
1319 my (@w, @h);
1320
1321 for my $y (0 .. $#{$self->{children}}) {
1322 my $row = $self->{children}[$y]
1323 or next;
1324
1325 for my $x (0 .. $#$row) {
1326 my $widget = $row->[$x]
1327 or next;
1328 my ($w, $h) = @$widget{qw(req_w req_h)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1329 1621
1330 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1331 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1332 } 1626 }
1333 } 1627 }
1334 1628
1335 (\@w, \@h) 1629 (\@w, \@h)
1336} 1630}
… …
1352 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1353 1647
1354 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1355 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1356 1650
1357 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1358 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1359 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1360 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1361 1655
1362 # linearly scale sizes
1363 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365 1657
1366 CFClient::UI::harmonize $ws; 1658 CFPlus::UI::harmonize $ws;
1659
1660 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1;
1663
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665
1367 CFClient::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1368 1667
1369 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1370 1670
1371 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1372 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1373 or next;
1374 1673
1375 my $x = 0; 1674 $widget->configure (
1376 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1377 1677 );
1378 for my $c (0 .. $#$row) { 1678 }
1379 my $col_w = $ws->[$c];
1380 1679
1381 if (my $widget = $row->[$c]) { 1680 1
1382 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1383 }
1384 1682
1385 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) {
1699 my ($mode, $val, $max) = @_;
1700
1701 $mode eq "abs" ? $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704}
1705
1706sub size_request {
1707 my ($self) = @_;
1708
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710
1711 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1714
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1386 } 1721 }
1722 }
1387 1723
1388 $y += $row_h; 1724 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1;
1726
1727 # now layout remaining widgets
1728 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1730
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1739 }
1740 }
1741
1742 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1;
1744
1745 ($W, $H)
1746}
1747
1748sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_;
1750
1751 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1753
1754 $x = _scale $pos, $x, $W;
1755 $y = _scale $pos, $x, $H;
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758
1759 $child->configure ($x, $y, $w, $h);
1389 } 1760 }
1390 1761
1391 1 1762 1
1392} 1763}
1393 1764
1394sub find_widget {
1395 my ($self, $x, $y) = @_;
1396
1397 $x -= $self->{x};
1398 $y -= $self->{y};
1399
1400 my $res;
1401
1402 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1403 $res = $_->find_widget ($x, $y)
1404 and return $res;
1405 }
1406
1407 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1408}
1409
1410sub _draw {
1411 my ($self) = @_;
1412
1413 for (grep $_, @{$self->{children}}) {
1414 $_->draw for grep $_, @$_;
1415 }
1416}
1417
1418############################################################################# 1765#############################################################################
1419 1766
1420package CFClient::UI::Box; 1767package CFPlus::UI::Box;
1421 1768
1422our @ISA = CFClient::UI::Container::; 1769our @ISA = CFPlus::UI::Container::;
1423 1770
1424sub size_request { 1771sub size_request {
1425 my ($self) = @_; 1772 my ($self) = @_;
1426 1773
1427 $self->{vertical} 1774 $self->{vertical}
… …
1437 1784
1438sub invoke_size_allocate { 1785sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_; 1786 my ($self, $w, $h) = @_;
1440 1787
1441 my $space = $self->{vertical} ? $h : $w; 1788 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children}; 1789 my @children = $self->visible_children;
1443 1790
1444 my @req; 1791 my @req;
1445 1792
1446 if ($self->{homogeneous}) { 1793 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children; 1794 @req = ($space / (@children || 1)) x @children;
1448 } else { 1795 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1796 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450 my $req = List::Util::sum @req; 1797 my $req = List::Util::sum @req;
1451 1798
1452 if ($req > $space) { 1799 if ($req > $space) {
1453 # ah well, not enough space 1800 # ah well, not enough space
1454 $_ *= $space / $req for @req; 1801 $_ *= $space / $req for @req;
1455 } else { 1802 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1803 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457 1804
1458 $space = ($space - $req) / $expand; # remaining space to give away 1805 $space = ($space - $req) / $expand; # remaining space to give away
1459 1806
1460 $req[$_] += $space * $children->[$_]{expand} 1807 $req[$_] += $space * $children[$_]{expand}
1461 for 0 .. $#$children; 1808 for 0 .. $#children;
1462 } 1809 }
1463 } 1810 }
1464 1811
1465 CFClient::UI::harmonize \@req; 1812 CFPlus::UI::harmonize \@req;
1466 1813
1467 my $pos = 0; 1814 my $pos = 0;
1468 for (0 .. $#$children) { 1815 for (0 .. $#children) {
1469 my $alloc = $req[$_]; 1816 my $alloc = $req[$_];
1470 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1817 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471 1818
1472 $pos += $alloc; 1819 $pos += $alloc;
1473 } 1820 }
1474 1821
1475 1 1822 1
1476} 1823}
1477 1824
1478############################################################################# 1825#############################################################################
1479 1826
1480package CFClient::UI::HBox; 1827package CFPlus::UI::HBox;
1481 1828
1482our @ISA = CFClient::UI::Box::; 1829our @ISA = CFPlus::UI::Box::;
1483 1830
1484sub new { 1831sub new {
1485 my $class = shift; 1832 my $class = shift;
1486 1833
1487 $class->SUPER::new ( 1834 $class->SUPER::new (
… …
1490 ) 1837 )
1491} 1838}
1492 1839
1493############################################################################# 1840#############################################################################
1494 1841
1495package CFClient::UI::VBox; 1842package CFPlus::UI::VBox;
1496 1843
1497our @ISA = CFClient::UI::Box::; 1844our @ISA = CFPlus::UI::Box::;
1498 1845
1499sub new { 1846sub new {
1500 my $class = shift; 1847 my $class = shift;
1501 1848
1502 $class->SUPER::new ( 1849 $class->SUPER::new (
… …
1505 ) 1852 )
1506} 1853}
1507 1854
1508############################################################################# 1855#############################################################################
1509 1856
1510package CFClient::UI::Label; 1857package CFPlus::UI::Label;
1511 1858
1512our @ISA = CFClient::UI::DrawBG::; 1859our @ISA = CFPlus::UI::DrawBG::;
1513 1860
1514use CFClient::OpenGL; 1861use CFPlus::OpenGL;
1515 1862
1516sub new { 1863sub new {
1517 my ($class, %arg) = @_; 1864 my ($class, %arg) = @_;
1518 1865
1519 my $self = $class->SUPER::new ( 1866 my $self = $class->SUPER::new (
… …
1522 #active_bg => none 1869 #active_bg => none
1523 #font => default_font 1870 #font => default_font
1524 #text => initial text 1871 #text => initial text
1525 #markup => initial narkup 1872 #markup => initial narkup
1526 #max_w => maximum pixel width 1873 #max_w => maximum pixel width
1874 #style => 0, # render flags
1527 ellipsise => 3, # end 1875 ellipsise => 3, # end
1528 layout => (new CFClient::Layout), 1876 layout => (new CFPlus::Layout),
1529 fontsize => 1, 1877 fontsize => 1,
1530 align => -1, 1878 align => -1,
1531 valign => -1, 1879 valign => -1,
1532 padding_x => 2, 1880 padding_x => 2,
1533 padding_y => 2, 1881 padding_y => 2,
1534 can_events => 0, 1882 can_events => 0,
1535 %arg 1883 %arg
1536 ); 1884 );
1537 1885
1538 if (exists $self->{template}) { 1886 if (exists $self->{template}) {
1539 my $layout = new CFClient::Layout; 1887 my $layout = new CFPlus::Layout;
1540 $layout->set_text (delete $self->{template}); 1888 $layout->set_text (delete $self->{template});
1541 $self->{template} = $layout; 1889 $self->{template} = $layout;
1542 } 1890 }
1543 1891
1544 if (exists $self->{markup}) { 1892 if (exists $self->{markup}) {
… …
1548 } 1896 }
1549 1897
1550 $self 1898 $self
1551} 1899}
1552 1900
1553sub escape($) {
1554 local $_ = $_[0];
1555
1556 s/&/&amp;/g;
1557 s/>/&gt;/g;
1558 s/</&lt;/g;
1559
1560 $_
1561}
1562
1563sub update { 1901sub update {
1564 my ($self) = @_; 1902 my ($self) = @_;
1565 1903
1566 delete $self->{texture}; 1904 delete $self->{texture};
1567 $self->SUPER::update; 1905 $self->SUPER::update;
… …
1578 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1579 1917
1580 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1581 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
1582 1920
1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584 $self->{layout}->set_text ($text); 1921 $self->{layout}->set_text ($text);
1585 1922
1586 delete $self->{size_req}; 1923 delete $self->{size_req};
1587 $self->realloc; 1924 $self->realloc;
1588 $self->update; 1925 $self->update;
… …
1594 return if $self->{text} eq "M$markup"; 1931 return if $self->{text} eq "M$markup";
1595 $self->{text} = "M$markup"; 1932 $self->{text} = "M$markup";
1596 1933
1597 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1934 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598 1935
1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600 $self->{layout}->set_markup ($markup); 1936 $self->{layout}->set_markup ($markup);
1601 1937
1602 delete $self->{size_req}; 1938 delete $self->{size_req};
1603 $self->realloc; 1939 $self->realloc;
1604 $self->update; 1940 $self->update;
… …
1616 1952
1617 my ($w, $h) = $self->{layout}->size; 1953 my ($w, $h) = $self->{layout}->size;
1618 1954
1619 if (exists $self->{template}) { 1955 if (exists $self->{template}) {
1620 $self->{template}->set_font ($self->{font}) if $self->{font}; 1956 $self->{template}->set_font ($self->{font}) if $self->{font};
1957 $self->{template}->set_width ($self->{max_w} || -1);
1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1958 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1959
1623 my ($w2, $h2) = $self->{template}->size; 1960 my ($w2, $h2) = $self->{template}->size;
1624 1961
1625 $w = List::Util::max $w, $w2; 1962 $w = List::Util::max $w, $w2;
… …
1630 }; 1967 };
1631 1968
1632 @{ $self->{size_req} } 1969 @{ $self->{size_req} }
1633} 1970}
1634 1971
1972sub baseline_shift {
1973 $_[0]{layout}->descent
1974}
1975
1635sub invoke_size_allocate { 1976sub invoke_size_allocate {
1636 my ($self, $w, $h) = @_; 1977 my ($self, $w, $h) = @_;
1637 1978
1638 delete $self->{ox}; 1979 delete $self->{ox};
1639 1980
… …
1645 1986
1646sub set_fontsize { 1987sub set_fontsize {
1647 my ($self, $fontsize) = @_; 1988 my ($self, $fontsize) = @_;
1648 1989
1649 $self->{fontsize} = $fontsize; 1990 $self->{fontsize} = $fontsize;
1991 delete $self->{size_req};
1650 delete $self->{texture}; 1992 delete $self->{texture};
1651 1993
1652 $self->realloc; 1994 $self->realloc;
1653} 1995}
1654 1996
1655sub reconfigure { 1997sub reconfigure {
1656 my ($self) = @_; 1998 my ($self) = @_;
1657 1999
1658 delete $self->{size_req}; 2000 delete $self->{size_req};
2001 delete $self->{texture};
1659 2002
1660 $self->SUPER::reconfigure; 2003 $self->SUPER::reconfigure;
1661} 2004}
1662 2005
1663sub _draw { 2006sub _draw {
1664 my ($self) = @_; 2007 my ($self) = @_;
1665 2008
1666 $self->SUPER::_draw; # draw background, if applicable 2009 $self->SUPER::_draw; # draw background, if applicable
1667 2010
1668 my $tex = $self->{texture} ||= do { 2011 my $size = $self->{texture} ||= do {
1669 $self->{layout}->set_foreground (@{$self->{fg}}); 2012 $self->{layout}->set_foreground (@{$self->{fg}});
1670 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2013 $self->{layout}->set_font ($self->{font}) if $self->{font};
1671 $self->{layout}->set_width ($self->{w}); 2014 $self->{layout}->set_width ($self->{w});
1672 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2015 $self->{layout}->set_ellipsise ($self->{ellipsise});
1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2016 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2017 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675 2018
1676 new_from_layout CFClient::Texture $self->{layout} 2019 [$self->{layout}->size]
1677 }; 2020 };
1678 2021
1679 unless (exists $self->{ox}) { 2022 unless (exists $self->{ox}) {
1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2023 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2024 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682 : ($self->{w} - $tex->{w}) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
1683 2026
1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686 : ($self->{h} - $tex->{h}) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
1687 }; 2030 };
1688 2031
1689 glEnable GL_TEXTURE_2D; 2032# unless ($self->{list}) {
1690 2033# $self->{list} = CFPlus::OpenGL::glGenList;
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2034# CFPlus::OpenGL::glNewList $self->{list};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2035# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1693 2036# CFPlus::OpenGL::glEndList;
1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1696 glColor @{$self->{fg}};
1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1701 } 2037# }
2038#
2039# CFPlus::OpenGL::glCallList $self->{list};
1702 2040
1703 glDisable GL_TEXTURE_2D; 2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704} 2042}
2043
2044#sub destroy {
2045# my ($self) = @_;
2046#
2047# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048#
2049# $self->SUPER::destroy;
2050#}
1705 2051
1706############################################################################# 2052#############################################################################
1707 2053
1708package CFClient::UI::EntryBase; 2054package CFPlus::UI::EntryBase;
1709 2055
1710our @ISA = CFClient::UI::Label::; 2056our @ISA = CFPlus::UI::Label::;
1711 2057
1712use CFClient::OpenGL; 2058use CFPlus::OpenGL;
1713 2059
1714sub new { 2060sub new {
1715 my $class = shift; 2061 my $class = shift;
1716 2062
1717 $class->SUPER::new ( 2063 $class->SUPER::new (
… …
1721 active_fg => [0, 0, 0], 2067 active_fg => [0, 0, 0],
1722 can_hover => 1, 2068 can_hover => 1,
1723 can_focus => 1, 2069 can_focus => 1,
1724 valign => 0, 2070 valign => 0,
1725 can_events => 1, 2071 can_events => 1,
2072 ellipsise => 0,
1726 #text => ... 2073 #text => ...
1727 #hidden => "*", 2074 #hidden => "*",
1728 @_ 2075 @_
1729 ) 2076 )
1730} 2077}
… …
1775 my $sym = $ev->{sym}; 2122 my $sym = $ev->{sym};
1776 my $uni = $ev->{unicode}; 2123 my $uni = $ev->{unicode};
1777 2124
1778 my $text = $self->get_text; 2125 my $text = $self->get_text;
1779 2126
2127 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2128
1780 if ($uni == 8) { 2129 if ($uni == 8) {
1781 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2130 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782 } elsif ($uni == 127) { 2131 } elsif ($uni == 127) {
1783 substr $text, $self->{cursor}, 1, ""; 2132 substr $text, $self->{cursor}, 1, "";
1784 } elsif ($sym == CFClient::SDLK_LEFT) { 2133 } elsif ($sym == CFPlus::SDLK_LEFT) {
1785 --$self->{cursor} if $self->{cursor}; 2134 --$self->{cursor} if $self->{cursor};
1786 } elsif ($sym == CFClient::SDLK_RIGHT) { 2135 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1787 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2136 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1788 } elsif ($sym == CFClient::SDLK_HOME) { 2137 } elsif ($sym == CFPlus::SDLK_HOME) {
2138 # what a hack
2139 $self->{cursor} =
2140 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2141 ? length $1
2142 : 0;
2143 } elsif ($sym == CFPlus::SDLK_END) {
2144 # uh, again
2145 $self->{cursor} =
2146 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2147 ? $self->{cursor} + length $1
2148 : length $self->{text};
2149 } elsif ($uni == 21) { # ctrl-u
2150 $text = "";
1789 $self->{cursor} = 0; 2151 $self->{cursor} = 0;
1790 } elsif ($sym == CFClient::SDLK_END) {
1791 $self->{cursor} = length $text;
1792 } elsif ($uni == 27) { 2152 } elsif ($uni == 27) {
1793 $self->emit ('escape'); 2153 $self->emit ('escape');
1794 } elsif ($uni) { 2154 } elsif ($uni == 0x0d) {
2155 substr $text, $self->{cursor}++, 0, "\012";
2156 } elsif ($uni >= 0x20) {
1795 substr $text, $self->{cursor}++, 0, chr $uni; 2157 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else { 2158 } else {
1797 return 0; 2159 return 0;
1798 } 2160 }
1799 2161
1800 $self->_set_text ($text); 2162 $self->_set_text ($text);
1801 2163
1802 $self->realloc; 2164 $self->realloc;
2165 $self->update;
1803 2166
1804 1 2167 1
1805} 2168}
1806 2169
1807sub invoke_focus_in { 2170sub invoke_focus_in {
… …
1819 2182
1820 my $idx = $self->{layout}->xy_to_index ($x, $y); 2183 my $idx = $self->{layout}->xy_to_index ($x, $y);
1821 2184
1822 # byte-index to char-index 2185 # byte-index to char-index
1823 my $text = $self->{text}; 2186 my $text = $self->{text};
1824 utf8::encode $text; 2187 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825 $self->{cursor} = length substr $text, 0, $idx; 2188 $self->{cursor} = length $text;
1826 2189
1827 $self->_set_text ($self->{text}); 2190 $self->_set_text ($self->{text});
1828 $self->update; 2191 $self->update;
1829 2192
1830 1 2193 1
… …
1869 utf8::encode $text; 2232 utf8::encode $text;
1870 2233
1871 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2234 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872 } 2235 }
1873 2236
1874 glColor @{$self->{fg}};
1875 glBegin GL_LINES; 2237 glBegin GL_LINES;
1876 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2238 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878 glEnd; 2240 glEnd;
1879 } 2241 }
1880} 2242}
1881 2243
2244#############################################################################
2245
1882package CFClient::UI::Entry; 2246package CFPlus::UI::Entry;
1883 2247
1884our @ISA = CFClient::UI::EntryBase::; 2248our @ISA = CFPlus::UI::EntryBase::;
1885 2249
1886use CFClient::OpenGL; 2250use CFPlus::OpenGL;
1887 2251
1888sub invoke_key_down { 2252sub invoke_key_down {
1889 my ($self, $ev) = @_; 2253 my ($self, $ev) = @_;
1890 2254
1891 my $sym = $ev->{sym}; 2255 my $sym = $ev->{sym};
1892 2256
1893 if ($sym == 13) { 2257 if ($ev->{uni} == 0x0d || $sym == 13) {
1894 unshift @{$self->{history}}, 2258 unshift @{$self->{history}},
1895 my $txt = $self->get_text; 2259 my $txt = $self->get_text;
2260
1896 $self->{history_pointer} = -1; 2261 $self->{history_pointer} = -1;
1897 $self->{history_saveback} = ''; 2262 $self->{history_saveback} = '';
1898 $self->emit (activate => $txt); 2263 $self->emit (activate => $txt);
1899 $self->update; 2264 $self->update;
1900 2265
1901 } elsif ($sym == CFClient::SDLK_UP) { 2266 } elsif ($sym == CFPlus::SDLK_UP) {
1902 if ($self->{history_pointer} < 0) { 2267 if ($self->{history_pointer} < 0) {
1903 $self->{history_saveback} = $self->get_text; 2268 $self->{history_saveback} = $self->get_text;
1904 } 2269 }
1905 if (@{$self->{history} || []} > 0) { 2270 if (@{$self->{history} || []} > 0) {
1906 $self->{history_pointer}++; 2271 $self->{history_pointer}++;
… …
1908 $self->{history_pointer} = @{$self->{history} || []} - 1; 2273 $self->{history_pointer} = @{$self->{history} || []} - 1;
1909 } 2274 }
1910 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2275 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1911 } 2276 }
1912 2277
1913 } elsif ($sym == CFClient::SDLK_DOWN) { 2278 } elsif ($sym == CFPlus::SDLK_DOWN) {
1914 $self->{history_pointer}--; 2279 $self->{history_pointer}--;
1915 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2280 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1916 2281
1917 if ($self->{history_pointer} >= 0) { 2282 if ($self->{history_pointer} >= 0) {
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2283 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1927 1 2292 1
1928} 2293}
1929 2294
1930############################################################################# 2295#############################################################################
1931 2296
2297package CFPlus::UI::TextEdit;
2298
2299our @ISA = CFPlus::UI::EntryBase::;
2300
2301use CFPlus::OpenGL;
2302
2303sub move_cursor_ver {
2304 my ($self, $dy) = @_;
2305
2306 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2307
2308 $y += $dy;
2309
2310 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2311 $self->{cursor} = $index;
2312 delete $self->{cur_h};
2313 $self->update;
2314 return;
2315 }
2316}
2317
2318sub invoke_key_down {
2319 my ($self, $ev) = @_;
2320
2321 my $sym = $ev->{sym};
2322
2323 if ($sym == CFPlus::SDLK_UP) {
2324 $self->move_cursor_ver (-1);
2325 } elsif ($sym == CFPlus::SDLK_DOWN) {
2326 $self->move_cursor_ver (+1);
2327 } else {
2328 return $self->SUPER::invoke_key_down ($ev)
2329 }
2330
2331 1
2332}
2333
2334#############################################################################
2335
1932package CFClient::UI::Button; 2336package CFPlus::UI::Button;
1933 2337
1934our @ISA = CFClient::UI::Label::; 2338our @ISA = CFPlus::UI::Label::;
1935 2339
1936use CFClient::OpenGL; 2340use CFPlus::OpenGL;
1937 2341
1938my @tex = 2342my @tex =
1939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2343 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1940 qw(b1_button_active.png); 2344 qw(b1_button_inactive.png b1_button_active.png);
1941 2345
1942sub new { 2346sub new {
1943 my $class = shift; 2347 my $class = shift;
1944 2348
1945 $class->SUPER::new ( 2349 $class->SUPER::new (
1946 padding_x => 4, 2350 padding_x => 4,
1947 padding_y => 4, 2351 padding_y => 4,
1948 fg => [1, 1, 1], 2352 fg => [1.0, 1.0, 1.0],
1949 active_fg => [0, 0, 1], 2353 active_fg => [0.8, 0.8, 0.8],
1950 can_hover => 1, 2354 can_hover => 1,
1951 align => 0, 2355 align => 0,
1952 valign => 0, 2356 valign => 0,
1953 can_events => 1, 2357 can_events => 1,
1954 @_ 2358 @_
… …
1972 2376
1973 glEnable GL_TEXTURE_2D; 2377 glEnable GL_TEXTURE_2D;
1974 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1975 glColor 0, 0, 0, 1; 2379 glColor 0, 0, 0, 1;
1976 2380
2381 my $tex = $tex[$GRAB == $self];
1977 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2382 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1978 2383
1979 glDisable GL_TEXTURE_2D; 2384 glDisable GL_TEXTURE_2D;
1980 2385
1981 $self->SUPER::_draw; 2386 $self->SUPER::_draw;
1982} 2387}
1983 2388
1984############################################################################# 2389#############################################################################
1985 2390
2391package CFPlus::UI::CheckBox;
2392
2393our @ISA = CFPlus::UI::DrawBG::;
2394
2395my @tex =
2396 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2397 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2398
2399use CFPlus::OpenGL;
2400
2401sub new {
2402 my $class = shift;
2403
2404 $class->SUPER::new (
2405 padding_x => 2,
2406 padding_y => 2,
2407 fg => [1, 1, 1],
2408 active_fg => [1, 1, 0],
2409 bg => [0, 0, 0, 0.2],
2410 active_bg => [1, 1, 1, 0.5],
2411 state => 0,
2412 can_hover => 1,
2413 @_
2414 )
2415}
2416
2417sub size_request {
2418 my ($self) = @_;
2419
2420 (6) x 2
2421}
2422
2423sub toggle {
2424 my ($self) = @_;
2425
2426 $self->{state} = !$self->{state};
2427 $self->emit (changed => $self->{state});
2428 $self->update;
2429}
2430
2431sub invoke_button_down {
2432 my ($self, $ev, $x, $y) = @_;
2433
2434 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2435 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2436 $self->toggle;
2437 } else {
2438 return 0
2439 }
2440
2441 1
2442}
2443
2444sub _draw {
2445 my ($self) = @_;
2446
2447 $self->SUPER::_draw;
2448
2449 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2450
2451 my ($w, $h) = @$self{qw(w h)};
2452
2453 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2454
2455 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2456
2457 my $tex = $self->{state} ? $tex[1] : $tex[0];
2458
2459 glEnable GL_TEXTURE_2D;
2460 $tex->draw_quad_alpha (0, 0, $s, $s);
2461 glDisable GL_TEXTURE_2D;
2462}
2463
2464#############################################################################
2465
2466package CFPlus::UI::Image;
2467
2468our @ISA = CFPlus::UI::Base::;
2469
2470use CFPlus::OpenGL;
2471
2472our %texture_cache;
2473
2474sub new {
2475 my $class = shift;
2476
2477 my $self = $class->SUPER::new (
2478 can_events => 0,
2479 @_,
2480 );
2481
2482 $self->{path} || $self->{tex}
2483 or Carp::croak "'path' or 'tex' attributes required";
2484
2485 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2486 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2487
2488 CFPlus::weaken $texture_cache{$self->{path}};
2489
2490 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2491
2492 $self
2493}
2494
2495sub STORABLE_freeze {
2496 my ($self, $cloning) = @_;
2497
2498 $self->{path}
2499 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2500
2501 $self->{path}
2502}
2503
2504sub STORABLE_attach {
2505 my ($self, $cloning, $path) = @_;
2506
2507 $self->new (path => $path)
2508}
2509
2510sub size_request {
2511 my ($self) = @_;
2512
2513 ($self->{tex}{w}, $self->{tex}{h})
2514}
2515
2516sub _draw {
2517 my ($self) = @_;
2518
2519 my $tex = $self->{tex};
2520
2521 my ($w, $h) = ($self->{w}, $self->{h});
2522
2523 if ($self->{rot90}) {
2524 glRotate 90, 0, 0, 1;
2525 glTranslate 0, -$self->{w}, 0;
2526
2527 ($w, $h) = ($h, $w);
2528 }
2529
2530 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532
2533 $tex->draw_quad (0, 0, $w, $h);
2534
2535 glDisable GL_TEXTURE_2D;
2536}
2537
2538#############################################################################
2539
1986package CFClient::UI::ImageButton; 2540package CFPlus::UI::ImageButton;
1987 2541
1988our @ISA = CFClient::UI::Image::; 2542our @ISA = CFPlus::UI::Image::;
1989 2543
1990use CFClient::OpenGL; 2544use CFPlus::OpenGL;
1991 2545
1992my %textures; 2546my %textures;
1993 2547
1994sub new { 2548sub new {
1995 my $class = shift; 2549 my $class = shift;
… …
2017 1 2571 1
2018} 2572}
2019 2573
2020############################################################################# 2574#############################################################################
2021 2575
2022package CFClient::UI::CheckBox;
2023
2024our @ISA = CFClient::UI::DrawBG::;
2025
2026my @tex =
2027 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2028 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2029
2030use CFClient::OpenGL;
2031
2032sub new {
2033 my $class = shift;
2034
2035 $class->SUPER::new (
2036 padding_x => 2,
2037 padding_y => 2,
2038 fg => [1, 1, 1],
2039 active_fg => [1, 1, 0],
2040 bg => [0, 0, 0, 0.2],
2041 active_bg => [1, 1, 1, 0.5],
2042 state => 0,
2043 can_hover => 1,
2044 @_
2045 )
2046}
2047
2048sub size_request {
2049 my ($self) = @_;
2050
2051 (6) x 2
2052}
2053
2054sub invoke_button_down {
2055 my ($self, $ev, $x, $y) = @_;
2056
2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2059 $self->{state} = !$self->{state};
2060 $self->emit (changed => $self->{state});
2061 } else {
2062 return 0
2063 }
2064
2065 1
2066}
2067
2068sub _draw {
2069 my ($self) = @_;
2070
2071 $self->SUPER::_draw;
2072
2073 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2074
2075 my ($w, $h) = @$self{qw(w h)};
2076
2077 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2078
2079 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2080
2081 my $tex = $self->{state} ? $tex[1] : $tex[0];
2082
2083 glEnable GL_TEXTURE_2D;
2084 $tex->draw_quad_alpha (0, 0, $s, $s);
2085 glDisable GL_TEXTURE_2D;
2086}
2087
2088#############################################################################
2089
2090package CFClient::UI::Image; 2576package CFPlus::UI::VGauge;
2091 2577
2092our @ISA = CFClient::UI::Base::; 2578our @ISA = CFPlus::UI::Base::;
2093
2094use CFClient::OpenGL;
2095use Carp qw/confess/;
2096
2097our %loaded_images;
2098
2099sub new {
2100 my $class = shift;
2101
2102 my $self = $class->SUPER::new (can_events => 0, @_);
2103
2104 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2105
2106 $loaded_images{$self->{image}} ||=
2107 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2108
2109 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2110
2111 Scalar::Util::weaken $loaded_images{$self->{image}};
2112
2113 $self->{aspect} = $tex->{w} / $tex->{h};
2114
2115 $self
2116}
2117
2118sub size_request {
2119 my ($self) = @_;
2120
2121 ($self->{tex}->{w}, $self->{tex}->{h})
2122}
2123
2124sub _draw {
2125 my ($self) = @_;
2126
2127 my $tex = $self->{tex};
2128
2129 my ($w, $h) = ($self->{w}, $self->{h});
2130
2131 if ($self->{rot90}) {
2132 glRotate 90, 0, 0, 1;
2133 glTranslate 0, -$self->{w}, 0;
2134
2135 ($w, $h) = ($h, $w);
2136 }
2137
2138 glEnable GL_TEXTURE_2D;
2139 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2140
2141 $tex->draw_quad_alpha (0, 0, $w, $h);
2142
2143 glDisable GL_TEXTURE_2D;
2144}
2145
2146#############################################################################
2147
2148package CFClient::UI::VGauge;
2149
2150our @ISA = CFClient::UI::Base::;
2151 2579
2152use List::Util qw(min max); 2580use List::Util qw(min max);
2153 2581
2154use CFClient::OpenGL; 2582use CFPlus::OpenGL;
2155 2583
2156my %tex = ( 2584my %tex = (
2157 food => [ 2585 food => [
2158 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2586 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2159 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2587 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2160 ], 2588 ],
2161 grace => [ 2589 grace => [
2162 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2590 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2163 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2591 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2164 ], 2592 ],
2165 hp => [ 2593 hp => [
2166 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2594 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2167 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2595 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2168 ], 2596 ],
2169 mana => [ 2597 mana => [
2170 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2598 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2599 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2172 ], 2600 ],
2173); 2601);
2174 2602
2175# eg. VGauge->new (gauge => 'food'), default gauge: food 2603# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2235 my $ycut1 = max 0, min 1, $ycut; 2663 my $ycut1 = max 0, min 1, $ycut;
2236 my $ycut2 = max 0, min 1, $ycut - 1; 2664 my $ycut2 = max 0, min 1, $ycut - 1;
2237 2665
2238 my $h1 = $self->{h} * (1 - $ycut1); 2666 my $h1 = $self->{h} * (1 - $ycut1);
2239 my $h2 = $self->{h} * (1 - $ycut2); 2667 my $h2 = $self->{h} * (1 - $ycut2);
2668 my $h3 = $self->{h};
2669
2670 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2240 2671
2241 glEnable GL_BLEND; 2672 glEnable GL_BLEND;
2242 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2673 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2674 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244 glEnable GL_TEXTURE_2D; 2675 glEnable GL_TEXTURE_2D;
… …
2263 2694
2264 if ($t3) { 2695 if ($t3) {
2265 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2696 glBindTexture GL_TEXTURE_2D, $t3->{name};
2266 glBegin GL_QUADS; 2697 glBegin GL_QUADS;
2267 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2698 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2268 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2699 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2269 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2700 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2270 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2701 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2271 glEnd; 2702 glEnd;
2272 } 2703 }
2273 2704
2274 glDisable GL_BLEND; 2705 glDisable GL_BLEND;
2275 glDisable GL_TEXTURE_2D; 2706 glDisable GL_TEXTURE_2D;
2276} 2707}
2277 2708
2278############################################################################# 2709#############################################################################
2279 2710
2280package CFClient::UI::Gauge; 2711package CFPlus::UI::Gauge;
2281 2712
2282our @ISA = CFClient::UI::VBox::; 2713our @ISA = CFPlus::UI::VBox::;
2283 2714
2284sub new { 2715sub new {
2285 my ($class, %arg) = @_; 2716 my ($class, %arg) = @_;
2286 2717
2287 my $self = $class->SUPER::new ( 2718 my $self = $class->SUPER::new (
… …
2289 can_hover => 1, 2720 can_hover => 1,
2290 can_events => 1, 2721 can_events => 1,
2291 %arg, 2722 %arg,
2292 ); 2723 );
2293 2724
2294 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2725 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2295 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2726 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2296 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2727 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2297 2728
2298 $self 2729 $self
2299} 2730}
2300 2731
2301sub set_fontsize { 2732sub set_fontsize {
… …
2322 $self->{value}->set_text ($val); 2753 $self->{value}->set_text ($val);
2323} 2754}
2324 2755
2325############################################################################# 2756#############################################################################
2326 2757
2327package CFClient::UI::Slider; 2758package CFPlus::UI::Slider;
2328 2759
2329use strict; 2760use strict;
2330 2761
2331use CFClient::OpenGL; 2762use CFPlus::OpenGL;
2332 2763
2333our @ISA = CFClient::UI::DrawBG::; 2764our @ISA = CFPlus::UI::DrawBG::;
2334 2765
2335my @tex = 2766my @tex =
2336 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2767 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2337 qw(s1_slider.png s1_slider_bg.png); 2768 qw(s1_slider.png s1_slider_bg.png);
2338 2769
2339sub new { 2770sub new {
2340 my $class = shift; 2771 my $class = shift;
2341 2772
… …
2409 2840
2410 $self->SUPER::invoke_button_down ($ev, $x, $y); 2841 $self->SUPER::invoke_button_down ($ev, $x, $y);
2411 2842
2412 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2843 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413 2844
2414 $self->mouse_motion ($ev, $x, $y) 2845 $self->invoke_mouse_motion ($ev, $x, $y)
2415} 2846}
2416 2847
2417sub invoke_mouse_motion { 2848sub invoke_mouse_motion {
2418 my ($self, $ev, $x, $y) = @_; 2849 my ($self, $ev, $x, $y) = @_;
2419 2850
… …
2428 } else { 2859 } else {
2429 return 0; 2860 return 0;
2430 } 2861 }
2431 2862
2432 1 2863 1
2864}
2865
2866sub invoke_mouse_wheel {
2867 my ($self, $ev) = @_;
2868
2869 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2870
2871 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2872
2873 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2874
2875 ! ! $delta
2433} 2876}
2434 2877
2435sub update { 2878sub update {
2436 my ($self) = @_; 2879 my ($self) = @_;
2437 2880
… …
2486 glDisable GL_TEXTURE_2D; 2929 glDisable GL_TEXTURE_2D;
2487} 2930}
2488 2931
2489############################################################################# 2932#############################################################################
2490 2933
2491package CFClient::UI::ValSlider; 2934package CFPlus::UI::ValSlider;
2492 2935
2493our @ISA = CFClient::UI::HBox::; 2936our @ISA = CFPlus::UI::HBox::;
2494 2937
2495sub new { 2938sub new {
2496 my ($class, %arg) = @_; 2939 my ($class, %arg) = @_;
2497 2940
2498 my $range = delete $arg{range}; 2941 my $range = delete $arg{range};
2499 2942
2500 my $self = $class->SUPER::new ( 2943 my $self = $class->SUPER::new (
2501 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2944 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2502 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2945 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2503 to_value => sub { shift }, 2946 to_value => sub { shift },
2504 from_value => sub { shift }, 2947 from_value => sub { shift },
2505 %arg, 2948 %arg,
2506 ); 2949 );
2507 2950
… …
2527sub set_range { shift->{slider}->set_range (@_) } 2970sub set_range { shift->{slider}->set_range (@_) }
2528sub set_value { shift->{slider}->set_value (@_) } 2971sub set_value { shift->{slider}->set_value (@_) }
2529 2972
2530############################################################################# 2973#############################################################################
2531 2974
2532package CFClient::UI::TextScroller; 2975package CFPlus::UI::TextScroller;
2533 2976
2534our @ISA = CFClient::UI::HBox::; 2977our @ISA = CFPlus::UI::HBox::;
2535 2978
2536use CFClient::OpenGL; 2979use CFPlus::OpenGL;
2537 2980
2538sub new { 2981sub new {
2539 my $class = shift; 2982 my $class = shift;
2540 2983
2541 my $self = $class->SUPER::new ( 2984 my $self = $class->SUPER::new (
2542 fontsize => 1, 2985 fontsize => 1,
2543 can_events => 0, 2986 can_events => 1,
2544 indent => 0, 2987 indent => 0,
2545 #font => default_font 2988 #font => default_font
2546 @_, 2989 @_,
2547 2990
2548 layout => (new CFClient::Layout 1), 2991 layout => (new CFPlus::Layout),
2549 par => [], 2992 par => [],
2993 max_par => 0,
2550 height => 0, 2994 height => 0,
2551 children => [ 2995 children => [
2552 (new CFClient::UI::Empty expand => 1), 2996 (new CFPlus::UI::Empty expand => 1),
2553 (new CFClient::UI::Slider vertical => 1), 2997 (new CFPlus::UI::Slider vertical => 1),
2554 ], 2998 ],
2555 ); 2999 );
2556 3000
2557 $self->{children}[1]->connect (changed => sub { $self->update }); 3001 $self->{children}[1]->connect (changed => sub { $self->update });
2558 3002
… …
2564 3008
2565 $self->{fontsize} = $fontsize; 3009 $self->{fontsize} = $fontsize;
2566 $self->reflow; 3010 $self->reflow;
2567} 3011}
2568 3012
3013sub size_request {
3014 my ($self) = @_;
3015
3016 my ($empty, $slider) = @{ $self->{children} };
3017
3018 local $self->{children} = [$empty, $slider];
3019 $self->SUPER::size_request
3020}
3021
2569sub invoke_size_allocate { 3022sub invoke_size_allocate {
2570 my ($self, $w, $h) = @_; 3023 my ($self, $w, $h) = @_;
2571 3024
3025 my ($empty, $slider, @other) = @{ $self->{children} };
3026 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3027
2572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3028 $self->{layout}->set_font ($self->{font}) if $self->{font};
2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3029 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574 $self->{layout}->set_width ($self->{children}[0]{w}); 3030 $self->{layout}->set_width ($empty->{w});
2575 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3031 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576 3032
2577 $self->reflow; 3033 $self->reflow;
2578 3034
3035 local $self->{children} = [$empty, $slider];
2579 $self->SUPER::invoke_size_allocate ($w, $h) 3036 $self->SUPER::invoke_size_allocate ($w, $h)
2580} 3037}
2581 3038
2582sub text_size { 3039sub invoke_mouse_wheel {
2583 my ($self, $text, $indent) = @_; 3040 my ($self, $ev) = @_;
3041
3042 return 0 unless $ev->{dy}; # only vertical movements
3043
3044 $self->{children}[1]->emit (mouse_wheel => $ev);
3045
3046 1
3047}
3048
3049sub get_layout {
3050 my ($self, $para) = @_;
2584 3051
2585 my $layout = $self->{layout}; 3052 my $layout = $self->{layout};
2586 3053
3054 $layout->set_font ($self->{font}) if $self->{font};
3055 $layout->set_foreground (@{$para->{fg}});
2587 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3056 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588 $layout->set_width ($self->{children}[0]{w} - $indent); 3057 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3058 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590 $layout->set_markup ($text); 3059 $layout->set_markup ($para->{markup});
3060
3061 $layout->set_shapes (
3062 map
3063 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3064 @{$para->{widget}}
2591 3065 );
3066
2592 $layout->size 3067 $layout
2593} 3068}
2594 3069
2595sub reflow { 3070sub reflow {
2596 my ($self) = @_; 3071 my ($self) = @_;
2597 3072
… …
2604 3079
2605 # todo: base offset on lines or so, not on pixels 3080 # todo: base offset on lines or so, not on pixels
2606 $self->{children}[1]->set_value ($offset); 3081 $self->{children}[1]->set_value ($offset);
2607} 3082}
2608 3083
3084sub current_paragraph {
3085 my ($self) = @_;
3086
3087 $self->{top_paragraph} - 1
3088}
3089
3090sub scroll_to {
3091 my ($self, $para) = @_;
3092
3093 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3094
3095 $self->{scroll_to} = $para;
3096 $self->update;
3097}
3098
2609sub clear { 3099sub clear {
2610 my ($self) = @_; 3100 my ($self) = @_;
3101
3102 my (undef, undef, @other) = @{ $self->{children} };
3103 $self->remove ($_) for @other;
2611 3104
2612 $self->{par} = []; 3105 $self->{par} = [];
2613 $self->{height} = 0; 3106 $self->{height} = 0;
2614 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3107 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615} 3108}
2616 3109
2617sub add_paragraph { 3110sub add_paragraph {
2618 my ($self, $color, $text, $indent) = @_; 3111 my $self = shift;
2619 3112
2620 for my $line (split /\n/, $text) { 3113 for my $para (@_) {
2621 my ($w, $h) = $self->text_size ($line); 3114 $para = {
3115 fg => [1, 1, 1, 1],
3116 indent => 0,
3117 markup => "",
3118 widget => [],
3119 ref $para ? %$para : (markup => $para),
3120 w => 1e10,
3121 wrapped => 1,
3122 };
3123
3124 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3125 push @{$self->{par}}, $para;
3126 }
3127
3128 if (my $max = $self->{max_par}) {
3129 shift @{$self->{par}} while @{$self->{par}} > $max;
3130 }
3131
3132 $self->{need_reflow}++;
3133 $self->update;
3134}
3135
3136sub scroll_to_bottom {
3137 my ($self) = @_;
3138
3139 $self->{scroll_to} = $#{$self->{par}};
3140 $self->update;
3141}
3142
3143sub force_uptodate {
3144 my ($self) = @_;
3145
3146 if (delete $self->{need_reflow}) {
3147 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3148
3149 my $height = 0;
3150
3151 for my $para (@{$self->{par}}) {
3152 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3153 my $layout = $self->get_layout ($para);
3154 my ($w, $h) = $layout->size;
3155
3156 $para->{w} = $w + $para->{indent};
3157 $para->{h} = $h;
3158 $para->{wrapped} = $layout->has_wrapped;
3159 }
3160
3161 $para->{y} = $height;
3162 $height += $para->{h};
3163 }
3164
2622 $self->{height} += $h; 3165 $self->{height} = $height;
2623 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3166 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2624 }
2625 3167
2626 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3168 delete $self->{texture};
3169 }
3170
3171 if (my $paridx = delete $self->{scroll_to}) {
3172 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3173 }
2627} 3174}
2628 3175
2629sub update { 3176sub update {
2630 my ($self) = @_; 3177 my ($self) = @_;
2631 3178
… …
2634 return unless $self->{h} > 0; 3181 return unless $self->{h} > 0;
2635 3182
2636 delete $self->{texture}; 3183 delete $self->{texture};
2637 3184
2638 $ROOT->on_post_alloc ($self => sub { 3185 $ROOT->on_post_alloc ($self => sub {
3186 $self->force_uptodate;
3187
2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3188 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640 3189
2641 if (delete $self->{need_reflow}) {
2642 my $height = 0;
2643
2644 my $layout = $self->{layout};
2645
2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2648 for (@{$self->{par}}) {
2649 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2650 $layout->set_width ($W - $_->[3]);
2651 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2652 $layout->set_markup ($_->[4]);
2653 my ($w, $h) = $layout->size;
2654 $_->[0] = $w + $_->[3];
2655 $_->[1] = $h;
2656 }
2657
2658 $height += $_->[1];
2659 }
2660
2661 $self->{height} = $height;
2662
2663 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2664
2665 delete $self->{texture};
2666 }
2667
2668 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3190 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2669 glClearColor 0, 0, 0, 0; 3191 glClearColor 0, 0, 0, 0;
2670 glClear GL_COLOR_BUFFER_BIT; 3192 glClear GL_COLOR_BUFFER_BIT;
2671 3193
3194 package CFPlus::UI::Base;
3195 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3196 (0, 0, $self->{w}, $self->{h});
3197
3198 my $top = int $self->{children}[1]{range}[0];
3199
3200 my $paridx = 0;
3201 my $top_paragraph;
2672 my $top = int $self->{children}[1]{range}[0]; 3202 my $top = int $self->{children}[1]{range}[0];
2673 3203
2674 my $y0 = $top; 3204 my $y0 = $top;
2675 my $y1 = $top + $H; 3205 my $y1 = $top + $H;
2676 3206
2677 my $y = 0;
2678
2679 my $layout = $self->{layout};
2680
2681 $layout->set_font ($self->{font}) if $self->{font};
2682
2683 glEnable GL_BLEND;
2684 #TODO# not correct in windows where rgba is forced off
2685 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2686
2687 for my $par (@{$self->{par}}) { 3207 for my $para (@{$self->{par}}) {
2688 my $h = $par->[1]; 3208 my $h = $para->{h};
3209 my $y = $para->{y};
2689 3210
2690 if ($y0 < $y + $h && $y < $y1) { 3211 if ($y0 < $y + $h && $y < $y1) {
2691 $layout->set_foreground (@{ $par->[2] }); 3212 my $layout = $self->get_layout ($para);
2692 $layout->set_width ($W - $par->[3]);
2693 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2694 $layout->set_markup ($par->[4]);
2695 3213
2696 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3214 $layout->render ($para->{indent}, $y - $y0);
2697 3215
2698 glRasterPos $par->[3], $y - $y0; 3216 if (my @w = @{ $para->{widget} }) {
2699 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3217 my @s = $layout->get_shapes;
3218
3219 for (@w) {
3220 my ($dx, $dy) = splice @s, 0, 2, ();
3221
3222 $_->{x} = $dx + $para->{indent};
3223 $_->{y} = $dy + $y - $y0;
3224
3225 $_->draw;
3226 }
3227 }
2700 } 3228 }
2701 3229
2702 $y += $h; 3230 $paridx++;
3231 $top_paragraph ||= $paridx if $y >= $top;
2703 } 3232 }
2704 3233
2705 glDisable GL_BLEND; 3234 $self->{top_paragraph} = $top_paragraph;
2706 }; 3235 };
2707 }); 3236 });
3237}
3238
3239sub reconfigure {
3240 my ($self) = @_;
3241
3242 $self->SUPER::reconfigure;
3243
3244 $_->{w} = 1e10 for @{ $self->{par} };
3245 $self->reflow;
2708} 3246}
2709 3247
2710sub _draw { 3248sub _draw {
2711 my ($self) = @_; 3249 my ($self) = @_;
2712 3250
… …
2715 glColor 0, 0, 0, 1; 3253 glColor 0, 0, 0, 1;
2716 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3254 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717 glDisable GL_TEXTURE_2D; 3255 glDisable GL_TEXTURE_2D;
2718 3256
2719 $self->{children}[1]->draw; 3257 $self->{children}[1]->draw;
2720
2721} 3258}
2722 3259
2723############################################################################# 3260#############################################################################
2724 3261
2725package CFClient::UI::Animator; 3262package CFPlus::UI::Animator;
2726 3263
2727use CFClient::OpenGL; 3264use CFPlus::OpenGL;
2728 3265
2729our @ISA = CFClient::UI::Bin::; 3266our @ISA = CFPlus::UI::Bin::;
2730 3267
2731sub moveto { 3268sub moveto {
2732 my ($self, $x, $y) = @_; 3269 my ($self, $x, $y) = @_;
2733 3270
2734 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3271 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2762 glPopMatrix; 3299 glPopMatrix;
2763} 3300}
2764 3301
2765############################################################################# 3302#############################################################################
2766 3303
2767package CFClient::UI::Flopper; 3304package CFPlus::UI::Flopper;
2768 3305
2769our @ISA = CFClient::UI::Button::; 3306our @ISA = CFPlus::UI::Button::;
2770 3307
2771sub new { 3308sub new {
2772 my $class = shift; 3309 my $class = shift;
2773 3310
2774 my $self = $class->SUPER::new ( 3311 my $self = $class->SUPER::new (
… …
2786 $self->{other}->toggle_visibility; 3323 $self->{other}->toggle_visibility;
2787} 3324}
2788 3325
2789############################################################################# 3326#############################################################################
2790 3327
2791package CFClient::UI::Tooltip; 3328package CFPlus::UI::Tooltip;
2792 3329
2793our @ISA = CFClient::UI::Bin::; 3330our @ISA = CFPlus::UI::Bin::;
2794 3331
2795use CFClient::OpenGL; 3332use CFPlus::OpenGL;
2796 3333
2797sub new { 3334sub new {
2798 my $class = shift; 3335 my $class = shift;
2799 3336
2800 $class->SUPER::new ( 3337 $class->SUPER::new (
… …
2803 ) 3340 )
2804} 3341}
2805 3342
2806sub set_tooltip_from { 3343sub set_tooltip_from {
2807 my ($self, $widget) = @_; 3344 my ($self, $widget) = @_;
3345
3346 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3347 if $widget->{tooltip} =~ /^#(.*)$/;
2808 3348
2809 my $tooltip = $widget->{tooltip}; 3349 my $tooltip = $widget->{tooltip};
2810 3350
2811 if ($ENV{CFPLUS_DEBUG} & 2) { 3351 if ($ENV{CFPLUS_DEBUG} & 2) {
2812 $tooltip .= "\n\n" . (ref $widget) . "\n" 3352 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2816 } 3356 }
2817 3357
2818 $tooltip =~ s/^\n+//; 3358 $tooltip =~ s/^\n+//;
2819 $tooltip =~ s/\n+$//; 3359 $tooltip =~ s/\n+$//;
2820 3360
2821 $self->add (new CFClient::UI::Label 3361 $self->add (new CFPlus::UI::Label
2822 markup => $tooltip, 3362 markup => $tooltip,
2823 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3363 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2824 fontsize => 0.8, 3364 fontsize => 0.8,
2825 fg => [0, 0, 0, 1], 3365 style => 1, # FLAG_INVERSE
2826 ellipsise => 0, 3366 ellipsise => 0,
2827 font => ($widget->{tooltip_font} || $::FONT_PROP), 3367 font => ($widget->{tooltip_font} || $::FONT_PROP),
2828 ); 3368 );
2829} 3369}
2830 3370
… …
2849 3389
2850 $self->{root}->on_post_alloc ("move_$self" => sub { 3390 $self->{root}->on_post_alloc ("move_$self" => sub {
2851 my $widget = $self->{owner} 3391 my $widget = $self->{owner}
2852 or return; 3392 or return;
2853 3393
3394 if ($widget->{visible}) {
2854 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3395 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2855 3396
2856 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3397 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2857 if $x + $self->{w} > $self->{root}{w}; 3398 if $x + $self->{w} > $self->{root}{w};
2858 3399
2859 $self->move_abs ($x, $y); 3400 $self->move_abs ($x, $y);
3401 } else {
3402 $self->hide;
3403 }
2860 }); 3404 });
2861} 3405}
2862 3406
2863sub _draw { 3407sub _draw {
2864 my ($self) = @_; 3408 my ($self) = @_;
… …
2888 $self->SUPER::_draw; 3432 $self->SUPER::_draw;
2889} 3433}
2890 3434
2891############################################################################# 3435#############################################################################
2892 3436
2893package CFClient::UI::Face; 3437package CFPlus::UI::Face;
2894 3438
2895our @ISA = CFClient::UI::Base::; 3439our @ISA = CFPlus::UI::DrawBG::;
2896 3440
2897use CFClient::OpenGL; 3441use CFPlus::OpenGL;
2898 3442
2899sub new { 3443sub new {
2900 my $class = shift; 3444 my $class = shift;
2901 3445
2902 my $self = $class->SUPER::new ( 3446 my $self = $class->SUPER::new (
3447 size_w => 32,
3448 size_h => 8,
2903 aspect => 1, 3449 aspect => 1,
2904 can_events => 0, 3450 can_events => 0,
2905 @_, 3451 @_,
2906 ); 3452 );
2907 3453
2908 if ($self->{anim} && $self->{animspeed}) { 3454 if ($self->{anim} && $self->{animspeed}) {
2909 Scalar::Util::weaken (my $widget = $self); 3455 CFPlus::weaken (my $widget = $self);
2910 3456
3457 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3458 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2911 $self->{timer} = Event->timer ( 3459 $self->{timer} = Event->timer (
2912 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2913 hard => 1, 3460 parked => 1,
2914 interval => $self->{animspeed},
2915 cb => sub { 3461 cb => sub {
3462 return unless $::CONN && $widget;
3463
2916 ++$widget->{frame}; 3464 ++$widget->{frame};
3465 $widget->update_face;
2917 $widget->update; 3466 $widget->update;
3467
3468 $widget->update_timer;
2918 }, 3469 },
2919 ); 3470 );
3471
3472 $self->update_face;
3473 $self->update_timer;
2920 } 3474 }
2921 3475
2922 $self 3476 $self
2923} 3477}
2924 3478
3479sub update_timer {
3480 my ($self) = @_;
3481
3482 return unless $self->{timer};
3483
3484 if ($self->{visible}) {
3485 $self->{timer}->at (
3486 $self->{anim_start}
3487 + $self->{animspeed}
3488 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3489 );
3490 $self->{timer}->start;
3491 } else {
3492 $self->{timer}->stop;
3493 }
3494}
3495
3496sub update_face {
3497 my ($self) = @_;
3498
3499 return unless $::CONN;
3500
3501 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3502 if ($anim && @$anim) {
3503 delete $self->{wait_face};
3504 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3505 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3506 }
3507 }
3508}
3509
2925sub size_request { 3510sub size_request {
2926 (32, 8) 3511 my ($self) = @_;
3512
3513 if ($::CONN) {
3514 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3515 if (my $tex = $::CONN->{texture}[$faceid]) {
3516 $self->{tex} = $tex;
3517 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3518 } else {
3519 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3520 $self->realloc;
3521 });
3522 }
3523 }
3524 }
3525
3526 ($self->{size_w} || 8, $self->{size_h} || 8)
2927} 3527}
2928 3528
2929sub update { 3529sub update {
2930 my ($self) = @_; 3530 my ($self) = @_;
2931 3531
2932 return unless $self->{visible}; 3532 return unless $self->{visible};
2933 3533
2934 $self->SUPER::update; 3534 $self->SUPER::update;
2935} 3535}
2936 3536
3537sub invoke_visibility_change {
3538 my ($self) = @_;
3539
3540 $self->update_timer;
3541
3542 0
3543}
3544
2937sub _draw { 3545sub _draw {
2938 my ($self) = @_; 3546 my ($self) = @_;
2939 3547
2940 return unless $::CONN; 3548 $self->SUPER::_draw;
2941 3549
2942 my $face; 3550 if (my $tex = $self->{tex}) {
2943
2944 if ($self->{frame}) {
2945 my $anim = $::CONN->{anim}[$self->{anim}];
2946
2947 $face = $anim->[ $self->{frame} % @$anim ]
2948 if $anim && @$anim;
2949 }
2950
2951 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2952
2953 if ($tex) {
2954 glEnable GL_TEXTURE_2D; 3551 glEnable GL_TEXTURE_2D;
2955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2956 glColor 0, 0, 0, 1; 3553 glColor 0, 0, 0, 1;
2957 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3554 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2958 glDisable GL_TEXTURE_2D; 3555 glDisable GL_TEXTURE_2D;
… …
2960} 3557}
2961 3558
2962sub destroy { 3559sub destroy {
2963 my ($self) = @_; 3560 my ($self) = @_;
2964 3561
2965 $self->{timer}->cancel 3562 (delete $self->{timer})->cancel
2966 if $self->{timer}; 3563 if $self->{timer};
2967 3564
2968 $self->SUPER::destroy; 3565 $self->SUPER::destroy;
2969} 3566}
2970 3567
2971############################################################################# 3568#############################################################################
2972 3569
2973package CFClient::UI::Buttonbar; 3570package CFPlus::UI::Buttonbar;
2974 3571
2975our @ISA = CFClient::UI::HBox::; 3572our @ISA = CFPlus::UI::HBox::;
2976 3573
2977# TODO: should actualyl wrap buttons and other goodies. 3574# TODO: should actually wrap buttons and other goodies.
2978 3575
2979############################################################################# 3576#############################################################################
2980 3577
2981package CFClient::UI::Menu; 3578package CFPlus::UI::Menu;
2982 3579
2983our @ISA = CFClient::UI::FancyFrame::; 3580our @ISA = CFPlus::UI::Toplevel::;
2984 3581
2985use CFClient::OpenGL; 3582use CFPlus::OpenGL;
2986 3583
2987sub new { 3584sub new {
2988 my $class = shift; 3585 my $class = shift;
2989 3586
2990 my $self = $class->SUPER::new ( 3587 my $self = $class->SUPER::new (
2991 items => [], 3588 items => [],
2992 z => 100, 3589 z => 100,
2993 @_, 3590 @_,
2994 ); 3591 );
2995 3592
2996 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3593 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2997 3594
2998 for my $item (@{ $self->{items} }) { 3595 for my $item (@{ $self->{items} }) {
2999 my ($widget, $cb, $tooltip) = @$item; 3596 my ($widget, $cb, $tooltip) = @$item;
3000 3597
3001 # handle various types of items, only text for now 3598 # handle various types of items, only text for now
3002 if (!ref $widget) { 3599 if (!ref $widget) {
3600 if ($widget =~ /\t/) {
3601 my ($left, $right) = split /\t/, $widget, 2;
3602
3003 $widget = new CFClient::UI::Label 3603 $widget = new CFPlus::UI::HBox
3004 can_hover => 1, 3604 can_hover => 1,
3005 can_events => 1, 3605 can_events => 1,
3606 tooltip => $tooltip,
3607 children => [
3608 (new CFPlus::UI::Label markup => $left, expand => 1),
3609 (new CFPlus::UI::Label markup => $right, align => +1),
3610 ],
3611 ;
3612
3613 } else {
3614 $widget = new CFPlus::UI::Label
3615 can_hover => 1,
3616 can_events => 1,
3006 markup => $widget, 3617 markup => $widget,
3007 tooltip => $tooltip 3618 tooltip => $tooltip;
3619 }
3008 } 3620 }
3009 3621
3010 $self->{item}{$widget} = $item; 3622 $self->{item}{$widget} = $item;
3011 3623
3012 $self->{vbox}->add ($widget); 3624 $self->{vbox}->add ($widget);
… …
3055 1 3667 1
3056} 3668}
3057 3669
3058############################################################################# 3670#############################################################################
3059 3671
3060package CFClient::UI::Multiplexer; 3672package CFPlus::UI::Multiplexer;
3061 3673
3062our @ISA = CFClient::UI::Container::; 3674our @ISA = CFPlus::UI::Container::;
3063 3675
3064sub new { 3676sub new {
3065 my $class = shift; 3677 my $class = shift;
3066 3678
3067 my $self = $class->SUPER::new ( 3679 my $self = $class->SUPER::new (
… …
3081 3693
3082 $self->{current} = $self->{children}[0] 3694 $self->{current} = $self->{children}[0]
3083 if @{ $self->{children} }; 3695 if @{ $self->{children} };
3084} 3696}
3085 3697
3698sub get_current_page {
3699 my ($self) = @_;
3700
3701 $self->{current}
3702}
3703
3086sub set_current_page { 3704sub set_current_page {
3087 my ($self, $page_or_widget) = @_; 3705 my ($self, $page_or_widget) = @_;
3088 3706
3089 my $widget = ref $page_or_widget 3707 my $widget = ref $page_or_widget
3090 ? $page_or_widget 3708 ? $page_or_widget
… …
3122 $self->{current}->draw; 3740 $self->{current}->draw;
3123} 3741}
3124 3742
3125############################################################################# 3743#############################################################################
3126 3744
3127package CFClient::UI::Notebook; 3745package CFPlus::UI::Notebook;
3128 3746
3129our @ISA = CFClient::UI::VBox::; 3747our @ISA = CFPlus::UI::VBox::;
3130 3748
3131sub new { 3749sub new {
3132 my $class = shift; 3750 my $class = shift;
3133 3751
3134 my $self = $class->SUPER::new ( 3752 my $self = $class->SUPER::new (
3135 buttonbar => (new CFClient::UI::Buttonbar), 3753 buttonbar => (new CFPlus::UI::Buttonbar),
3136 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3754 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3137 # filter => # will be put between multiplexer and $self 3755 # filter => # will be put between multiplexer and $self
3138 @_, 3756 @_,
3139 ); 3757 );
3140 3758
3141 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3759 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3145} 3763}
3146 3764
3147sub add { 3765sub add {
3148 my ($self, $title, $widget, $tooltip) = @_; 3766 my ($self, $title, $widget, $tooltip) = @_;
3149 3767
3150 Scalar::Util::weaken $self; 3768 CFPlus::weaken $self;
3151 3769
3152 $self->{buttonbar}->add (new CFClient::UI::Button 3770 unless (ref $title) {
3771 $title = new CFPlus::UI::Button
3153 markup => $title, 3772 markup => $title,
3154 tooltip => $tooltip, 3773 tooltip => $tooltip,
3774 );
3775 }
3776
3155 on_activate => sub { $self->set_current_page ($widget) }, 3777 $title->connect (activate => sub { $self->set_current_page ($widget) });
3156 ); 3778 $self->{buttonbar}->add ($title);
3157 3779
3158 $self->{multiplexer}->add ($widget); 3780 $self->{multiplexer}->add ($widget);
3781}
3782
3783sub get_current_page {
3784 my ($self) = @_;
3785
3786 $self->{multiplexer}->get_current_page
3159} 3787}
3160 3788
3161sub set_current_page { 3789sub set_current_page {
3162 my ($self, $page) = @_; 3790 my ($self, $page) = @_;
3163 3791
… …
3165 $self->emit (page_changed => $self->{multiplexer}{current}); 3793 $self->emit (page_changed => $self->{multiplexer}{current});
3166} 3794}
3167 3795
3168############################################################################# 3796#############################################################################
3169 3797
3170package CFClient::UI::Combobox; 3798package CFPlus::UI::Selector;
3171 3799
3172use utf8; 3800use utf8;
3173 3801
3174our @ISA = CFClient::UI::Button::; 3802our @ISA = CFPlus::UI::Button::;
3175 3803
3176sub new { 3804sub new {
3177 my $class = shift; 3805 my $class = shift;
3178 3806
3179 my $self = $class->SUPER::new ( 3807 my $self = $class->SUPER::new (
… …
3196 my ($value, $title, $tooltip) = @$_; 3824 my ($value, $title, $tooltip) = @$_;
3197 3825
3198 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3826 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199 } 3827 }
3200 3828
3201 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3829 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202} 3830}
3203 3831
3204sub _set_value { 3832sub _set_value {
3205 my ($self, $value) = @_; 3833 my ($self, $value) = @_;
3206 3834
… …
3221 $self->emit (changed => $value); 3849 $self->emit (changed => $value);
3222} 3850}
3223 3851
3224############################################################################# 3852#############################################################################
3225 3853
3226package CFClient::UI::Statusbox; 3854package CFPlus::UI::Statusbox;
3227 3855
3228our @ISA = CFClient::UI::VBox::; 3856our @ISA = CFPlus::UI::VBox::;
3229 3857
3230sub new { 3858sub new {
3231 my $class = shift; 3859 my $class = shift;
3232 3860
3233 my $self = $class->SUPER::new ( 3861 my $self = $class->SUPER::new (
3234 fontsize => 0.8, 3862 fontsize => 0.8,
3235 @_, 3863 @_,
3236 ); 3864 );
3237 3865
3238 Scalar::Util::weaken (my $this = $self); 3866 CFPlus::weaken (my $this = $self);
3239 3867
3240 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3868 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3241 3869
3242 $self 3870 $self
3243} 3871}
… …
3245sub reorder { 3873sub reorder {
3246 my ($self) = @_; 3874 my ($self) = @_;
3247 my $NOW = Time::HiRes::time; 3875 my $NOW = Time::HiRes::time;
3248 3876
3249 # freeze display when hovering over any label 3877 # freeze display when hovering over any label
3250 return if $CFClient::UI::TOOLTIP->{owner} 3878 return if $CFPlus::UI::TOOLTIP->{owner}
3251 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3879 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3252 values %{ $self->{item} }; 3880 values %{ $self->{item} };
3253 3881
3254 while (my ($k, $v) = each %{ $self->{item} }) { 3882 while (my ($k, $v) = each %{ $self->{item} }) {
3255 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3883 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3256 } 3884 }
… …
3277 for ($short) { 3905 for ($short) {
3278 s/^\s+//; 3906 s/^\s+//;
3279 s/\s+/ /g; 3907 s/\s+/ /g;
3280 } 3908 }
3281 3909
3282 new CFClient::UI::Label 3910 new CFPlus::UI::Label
3283 markup => $short, 3911 markup => $short,
3284 tooltip => $item->{tooltip}, 3912 tooltip => $item->{tooltip},
3285 tooltip_font => $::FONT_PROP, 3913 tooltip_font => $::FONT_PROP,
3286 tooltip_width => 0.67, 3914 tooltip_width => 0.67,
3287 fontsize => $item->{fontsize} || $self->{fontsize}, 3915 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3341 count => 1, 3969 count => 1,
3342 %arg, 3970 %arg,
3343 }; 3971 };
3344 } 3972 }
3345 3973
3974 $ROOT->on_refresh (reorder => sub {
3346 $self->reorder; 3975 $self->reorder;
3976 });
3347} 3977}
3348 3978
3349sub reconfigure { 3979sub reconfigure {
3350 my ($self) = @_; 3980 my ($self) = @_;
3351 3981
… …
3364 $self->SUPER::destroy; 3994 $self->SUPER::destroy;
3365} 3995}
3366 3996
3367############################################################################# 3997#############################################################################
3368 3998
3369package CFClient::UI::Inventory;
3370
3371our @ISA = CFClient::UI::ScrolledWindow::;
3372
3373sub new {
3374 my $class = shift;
3375
3376 my $self = $class->SUPER::new (
3377 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3378 @_,
3379 );
3380
3381 $self
3382}
3383
3384sub set_items {
3385 my ($self, $items) = @_;
3386
3387 $self->{child}->clear;
3388 return unless $items;
3389
3390 my @items = sort {
3391 ($a->{type} <=> $b->{type})
3392 or ($a->{name} cmp $b->{name})
3393 } @$items;
3394
3395 $self->{real_items} = \@items;
3396
3397 my $row = 0;
3398 for my $item (@items) {
3399 CFClient::Item::update_widgets $item;
3400
3401 $self->{child}->add (0, $row, $item->{face_widget});
3402 $self->{child}->add (1, $row, $item->{desc_widget});
3403 $self->{child}->add (2, $row, $item->{weight_widget});
3404
3405 $row++;
3406 }
3407}
3408
3409#############################################################################
3410
3411package CFClient::UI::BindEditor;
3412
3413our @ISA = CFClient::UI::FancyFrame::;
3414
3415sub new {
3416 my $class = shift;
3417
3418 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3419
3420 $self->add (my $vb = new CFClient::UI::VBox);
3421
3422
3423 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3424 text => "start recording",
3425 tooltip => "Start/Stops recording of actions."
3426 ."All subsequent actions after the recording started will be captured."
3427 ."The actions are displayed after the record was stopped."
3428 ."To bind the action you have to click on the 'Bind' button",
3429 on_activate => sub {
3430 unless ($self->{recording}) {
3431 $self->start;
3432 } else {
3433 $self->stop;
3434 }
3435 });
3436
3437 $vb->add (new CFClient::UI::Label text => "Actions:");
3438 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3439
3440 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3441 $vb->add (my $hb = new CFClient::UI::HBox);
3442 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3443 $hb->add (new CFClient::UI::Button
3444 text => "bind",
3445 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3446 on_activate => sub {
3447 $self->ask_for_bind;
3448 });
3449
3450 $vb->add (my $hb = new CFClient::UI::HBox);
3451 $hb->add (new CFClient::UI::Button
3452 text => "ok",
3453 expand => 1,
3454 tooltip => "This closes the binding editor and saves the binding",
3455 on_activate => sub {
3456 $self->hide;
3457 $self->commit;
3458 });
3459
3460 $hb->add (new CFClient::UI::Button
3461 text => "cancel",
3462 expand => 1,
3463 tooltip => "This closes the binding editor without saving",
3464 on_activate => sub {
3465 $self->hide;
3466 $self->{binding_cancel}->()
3467 if $self->{binding_cancel};
3468 });
3469
3470 $self->update_binding_widgets;
3471
3472 $self
3473}
3474
3475sub commit {
3476 my ($self) = @_;
3477 my ($mod, $sym, $cmds) = $self->get_binding;
3478 if ($sym != 0 && @$cmds > 0) {
3479 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3480 ."'. Don't forget 'Save Config'!");
3481 $self->{binding_change}->($mod, $sym, $cmds)
3482 if $self->{binding_change};
3483 } else {
3484 $::STATUSBOX->add ("No action bound, no key or action specified!");
3485 $self->{binding_cancel}->()
3486 if $self->{binding_cancel};
3487 }
3488}
3489
3490sub start {
3491 my ($self) = @_;
3492
3493 $self->{rec_btn}->set_text ("stop recording");
3494 $self->{recording} = 1;
3495 $self->clear_command_list;
3496 $::CONN->start_record if $::CONN;
3497}
3498
3499sub stop {
3500 my ($self) = @_;
3501
3502 $self->{rec_btn}->set_text ("start recording");
3503 $self->{recording} = 0;
3504
3505 my $rec;
3506 $rec = $::CONN->stop_record if $::CONN;
3507 return unless ref $rec eq 'ARRAY';
3508 $self->set_command_list ($rec);
3509}
3510
3511
3512sub ask_for_bind_and_commit {
3513 my ($self) = @_;
3514 $self->ask_for_bind (1);
3515}
3516
3517sub ask_for_bind {
3518 my ($self, $commit, $end_cb) = @_;
3519
3520 CFClient::Binder::open_binding_dialog (sub {
3521 my ($mod, $sym) = @_;
3522 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3523 $self->update_binding_widgets;
3524 $self->commit if $commit;
3525 $end_cb->() if $end_cb;
3526 });
3527}
3528
3529# $mod and $sym are the modifiers and key symbol
3530# $cmds is a array ref of strings (the commands)
3531# $cb is the callback that is executed on OK
3532# $ccb is the callback that is executed on CANCEL and
3533# when the binding was unsuccessful on OK
3534sub set_binding {
3535 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3536
3537 $self->clear_command_list;
3538 $self->{recording} = 0;
3539 $self->{rec_btn}->set_text ("start recording");
3540
3541 $self->{binding} = [$mod, $sym];
3542 $self->{commands} = $cmds;
3543
3544 $self->{binding_change} = $cb;
3545 $self->{binding_cancel} = $ccb;
3546
3547 $self->update_binding_widgets;
3548}
3549
3550# this is a shortcut method that asks for a binding
3551# and then just binds it.
3552sub do_quick_binding {
3553 my ($self, $cmds, $end_cb) = @_;
3554 $self->set_binding (undef, undef, $cmds, sub {
3555 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3556 });
3557 $self->ask_for_bind (1, $end_cb);
3558}
3559
3560sub update_binding_widgets {
3561 my ($self) = @_;
3562 my ($mod, $sym, $cmds) = $self->get_binding;
3563 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3564 $self->set_command_list ($cmds);
3565}
3566
3567sub get_binding {
3568 my ($self) = @_;
3569 return (
3570 $self->{binding}->[0],
3571 $self->{binding}->[1],
3572 [ grep { defined $_ } @{$self->{commands}} ]
3573 );
3574}
3575
3576sub clear_command_list {
3577 my ($self) = @_;
3578 $self->{cmdbox}->clear ();
3579}
3580
3581sub set_command_list {
3582 my ($self, $cmds) = @_;
3583
3584 $self->{cmdbox}->clear ();
3585 $self->{commands} = $cmds;
3586
3587 my $idx = 0;
3588
3589 for (@$cmds) {
3590 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3591
3592 my $i = $idx;
3593 $hb->add (new CFClient::UI::Label text => $_);
3594 $hb->add (new CFClient::UI::Button
3595 text => "delete",
3596 tooltip => "Deletes the action from the record",
3597 on_activate => sub {
3598 $self->{cmdbox}->remove ($hb);
3599 $cmds->[$i] = undef;
3600 });
3601
3602
3603 $idx++
3604 }
3605}
3606
3607#############################################################################
3608
3609package CFClient::UI::SpellList;
3610
3611our @ISA = CFClient::UI::Table::;
3612
3613sub new {
3614 my $class = shift;
3615
3616 my $self = $class->SUPER::new (
3617 binding => [],
3618 commands => [],
3619 @_,
3620 )
3621}
3622
3623my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3624
3625my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3626 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3627my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3629my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3633my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3635
3636sub rebuild_spell_list {
3637 my ($self) = @_;
3638
3639 $CFClient::UI::ROOT->on_refresh ($self => sub {
3640 $self->clear;
3641
3642 return unless $::CONN;
3643
3644 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3645 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3646 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3647 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3648 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3649
3650 my $row = 0;
3651
3652 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3653 my $spell = $self->{spell}{$_};
3654
3655 $row++;
3656
3657 my $spell_cb = sub {
3658 my ($widget, $ev) = @_;
3659
3660 if ($ev->{button} == 1) {
3661 $::CONN->user_send ("cast $spell->{name}");
3662 } elsif ($ev->{button} == 2) {
3663 $::CONN->user_send ("invoke $spell->{name}");
3664 } elsif ($ev->{button} == 3) {
3665 (new CFClient::UI::Menu
3666 items => [
3667 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3668 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669 ],
3670 )->popup ($ev);
3671 } else {
3672 return 0;
3673 }
3674
3675 1
3676 };
3677
3678 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3679
3680 #TODO: add path info to tooltip
3681 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3682
3683 $self->add (0, $row, new CFClient::UI::Face
3684 face => $spell->{face},
3685 can_hover => 1,
3686 can_events => 1,
3687 tooltip => $tooltip,
3688 on_button_down => $spell_cb,
3689 );
3690
3691 $self->add (1, $row, new CFClient::UI::Label
3692 expand => 1,
3693 text => $spell->{name},
3694 can_hover => 1,
3695 can_events => 1,
3696 tooltip => $tooltip,
3697 on_button_down => $spell_cb,
3698 );
3699
3700 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3701 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3702 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3703 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3704 }
3705 });
3706}
3707
3708sub add_spell {
3709 my ($self, $spell) = @_;
3710
3711 $self->{spell}->{$spell->{name}} = $spell;
3712 $self->rebuild_spell_list;
3713}
3714
3715sub remove_spell {
3716 my ($self, $spell) = @_;
3717
3718 delete $self->{spell}->{$spell->{name}};
3719 $self->rebuild_spell_list;
3720}
3721
3722sub clear_spells {
3723 my ($self) = @_;
3724
3725 $self->{spell} = {};
3726 $self->rebuild_spell_list;
3727}
3728
3729#############################################################################
3730
3731package CFClient::UI::Root; 3999package CFPlus::UI::Root;
3732 4000
3733our @ISA = CFClient::UI::Container::; 4001our @ISA = CFPlus::UI::Container::;
3734 4002
3735use List::Util qw(min max); 4003use List::Util qw(min max);
3736 4004
3737use CFClient::OpenGL; 4005use CFPlus::OpenGL;
3738 4006
3739sub new { 4007sub new {
3740 my $class = shift; 4008 my $class = shift;
3741 4009
3742 my $self = $class->SUPER::new ( 4010 my $self = $class->SUPER::new (
3743 visible => 1, 4011 visible => 1,
3744 @_, 4012 @_,
3745 ); 4013 );
3746 4014
3747 Scalar::Util::weaken ($self->{root} = $self); 4015 CFPlus::weaken ($self->{root} = $self);
3748 4016
3749 $self 4017 $self
3750} 4018}
3751 4019
3752sub size_request { 4020sub size_request {
… …
3847 while ($self->{refresh_hook}) { 4115 while ($self->{refresh_hook}) {
3848 $_->() 4116 $_->()
3849 for values %{delete $self->{refresh_hook}}; 4117 for values %{delete $self->{refresh_hook}};
3850 } 4118 }
3851 4119
3852 if ($self->{realloc}) { 4120 while ($self->{realloc}) {
3853 my %queue; 4121 my %queue;
3854 my @queue; 4122 my @queue;
3855 my $widget; 4123 my $widget;
3856 4124
3857 outer: 4125 outer:
… …
3904 } 4172 }
3905 } 4173 }
3906 4174
3907 delete $self->{realloc}{$widget+0}; 4175 delete $self->{realloc}{$widget+0};
3908 } 4176 }
3909 }
3910 4177
3911 while (my $size_alloc = delete $self->{size_alloc}) { 4178 while (my $size_alloc = delete $self->{size_alloc}) {
3912 my @queue = sort { $b->{visible} <=> $a->{visible} } 4179 my @queue = sort { $a->{visible} <=> $b->{visible} }
3913 values %$size_alloc; 4180 values %$size_alloc;
3914 4181
3915 while () { 4182 while () {
3916 my $widget = pop @queue || last; 4183 my $widget = pop @queue || last;
3917 4184
3918 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4185 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3919 4186
3920 $w = 0 if $w < 0; 4187 $w = max $widget->{min_w}, $w;
3921 $h = 0 if $h < 0; 4188 $h = max $widget->{min_h}, $h;
3922 4189
4190# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4191# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4192
4193 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4194 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4195
3923 $w = int $w + 0.5; 4196 $w = int $w + 0.5;
3924 $h = int $h + 0.5; 4197 $h = int $h + 0.5;
3925 4198
3926 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4199 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3927 $widget->{old_w} = $widget->{w}; 4200 $widget->{old_w} = $widget->{w};
3928 $widget->{old_h} = $widget->{h}; 4201 $widget->{old_h} = $widget->{h};
3929 4202
3930 $widget->{w} = $w; 4203 $widget->{w} = $w;
3931 $widget->{h} = $h; 4204 $widget->{h} = $h;
3932 4205
3933 $widget->emit (size_allocate => $w, $h); 4206 $widget->emit (size_allocate => $w, $h);
4207 }
3934 } 4208 }
3935 } 4209 }
3936 } 4210 }
3937 4211
3938 while ($self->{post_alloc_hook}) { 4212 while ($self->{post_alloc_hook}) {
3939 $_->() 4213 $_->()
3940 for values %{delete $self->{post_alloc_hook}}; 4214 for values %{delete $self->{post_alloc_hook}};
3941 } 4215 }
3942
3943 4216
3944 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4217 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3945 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4218 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3946 glClear GL_COLOR_BUFFER_BIT; 4219 glClear GL_COLOR_BUFFER_BIT;
3947 4220
… …
3950 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4223 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3951 glMatrixMode GL_MODELVIEW; 4224 glMatrixMode GL_MODELVIEW;
3952 glLoadIdentity; 4225 glLoadIdentity;
3953 4226
3954 { 4227 {
3955 package CFClient::UI::Base; 4228 package CFPlus::UI::Base;
3956 4229
3957 ($draw_x, $draw_y, $draw_w, $draw_h) = 4230 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3958 (0, 0, $self->{w}, $self->{h}); 4231 (0, 0, $self->{w}, $self->{h});
3959 }
3960 4232
3961 $self->_draw; 4233 $self->_draw;
4234 }
3962} 4235}
3963 4236
3964############################################################################# 4237#############################################################################
3965 4238
3966package CFClient::UI; 4239package CFPlus::UI;
3967 4240
3968$ROOT = new CFClient::UI::Root; 4241$ROOT = new CFPlus::UI::Root;
3969$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4242$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3970 4243
39711 42441
3972 4245

Diff Legend

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