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

Diff Legend

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