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.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.414 by root, Mon Jul 23 17:54:14 2007 UTC

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

Diff Legend

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