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.286 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 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) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $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; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $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}; 252 $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}; 253 $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}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
272 302
273 return unless $self->{visible}; 303 return unless $self->{visible};
274 304
275 $_->set_invisible for $self->children; 305 $_->set_invisible for $self->children;
276 306
307 delete $self->{visible};
277 delete $self->{root}; 308 delete $self->{root};
278 delete $self->{visible};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->focus_out; 316 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
289} 318}
290 319
291sub set_visibility { 320sub set_visibility {
292 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
293 322
294 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
295 324
296 $visible ? $self->hide 325 $visible ? $self->show
297 : $self->show; 326 : $self->hide;
298} 327}
299 328
300sub toggle_visibility { 329sub toggle_visibility {
301 my ($self) = @_; 330 my ($self) = @_;
302 331
… …
315} 344}
316 345
317sub move_abs { 346sub move_abs {
318 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
319 348
320 $self->{x} = List::Util::max 0, int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
323 352
324 $self->update; 353 $self->update;
325} 354}
326 355
… …
336sub size_request { 365sub size_request {
337 require Carp; 366 require Carp;
338 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
339} 368}
340 369
370sub baseline_shift {
371 0
372}
373
341sub configure { 374sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
343 376
344 if ($self->{aspect}) { 377 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
346 379
347 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 382
350 # use alignment to adjust x, y 383 # use alignment to adjust x, y
351 384
352 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
367 400
368 $self->{root}{size_alloc}{$self+0} = $self; 401 $self->{root}{size_alloc}{$self+0} = $self;
369 } 402 }
370} 403}
371 404
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 405sub children {
377 # nop 406 # nop
378} 407}
379 408
380sub visible_children { 409sub visible_children {
… …
398 427
399 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
400 429
401 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
402 431
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 435 }
407} 436}
408 437
409# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
410sub coord2local { 439sub coord2local {
411 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
412 441
442 Carp::confess unless $self->{parent};#d#
443
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 445}
415 446
416# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
417sub coord2global { 448sub coord2global {
418 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
419 450
451 Carp::confess unless $self->{parent};#d#
452
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 454}
422 455
423sub focus_in { 456sub invoke_focus_in {
424 my ($self) = @_; 457 my ($self) = @_;
425 458
426 return if $FOCUS == $self; 459 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
428 461
429 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
430 463
431 $self->_emit (focus_in => $focus); 464 $self->update;
432 465
433 $focus->update if $focus; 466 0
434 $FOCUS->update;
435} 467}
436 468
437sub focus_out { 469sub invoke_focus_out {
438 my ($self) = @_; 470 my ($self) = @_;
439 471
440 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
441 473
442 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
443 475
444 $self->_emit (focus_out => $focus); 476 $self->update;
445 477
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 479 unless $FOCUS;
450}
451 480
481 0
482}
483
484sub grab_focus {
485 my ($self) = @_;
486
487 $FOCUS->emit ("focus_out") if $FOCUS;
488 $self->emit ("focus_in");
489}
490
452sub mouse_motion { 0 } 491sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 492sub invoke_button_up { 0 }
454sub key_down { 0 } 493sub invoke_key_down { 0 }
455sub key_up { 0 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
456 496
457sub button_down { 497sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
459 499
460 $self->focus_in; 500 $self->grab_focus;
461 501
462 0 502 0
503}
504
505sub connect {
506 my ($self, $signal, $cb) = @_;
507
508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
528
529sub emit {
530 my ($self, $signal, @args) = @_;
531
532 # I do not really like this solution, but I do not like duplication
533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args)
463} 550}
464 551
465sub find_widget { 552sub find_widget {
466 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
467 554
… …
475} 562}
476 563
477sub set_parent { 564sub set_parent {
478 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
479 566
480 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 569}
506 570
507sub realloc { 571sub realloc {
508 my ($self) = @_; 572 my ($self) = @_;
509 573
… …
542 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
543 607
544 # update screen rectangle 608 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 611
550 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 615
… …
576 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
579 glEnd; 641 glEnd;
580 glPopMatrix; 642 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 } 644 }
583 645
584 $self->_draw; 646 $self->_draw;
585 glPopMatrix; 647 glPopMatrix;
586} 648}
… …
589 my ($self) = @_; 651 my ($self) = @_;
590 652
591 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
592} 654}
593 655
656my $cntx;#d#
594sub DESTROY { 657sub DESTROY {
595 my ($self) = @_; 658 my ($self) = @_;
596 659
660 return if CFPlus::in_destruct;
661
662 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
597 delete $WIDGET{$self+0}; 665 delete $WIDGET{$self+0};
598 #$self->deactivate;
599} 666}
600 667
601############################################################################# 668#############################################################################
602 669
603package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
604 671
605our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
606 673
607use strict; 674use strict;
608use CFClient::OpenGL; 675use CFPlus::OpenGL;
609 676
610sub new { 677sub new {
611 my $class = shift; 678 my $class = shift;
612 679
613 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
644 } 711 }
645} 712}
646 713
647############################################################################# 714#############################################################################
648 715
649package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
650 717
651our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
652 719
653sub new { 720sub new {
654 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
655 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
656} 723}
… …
663 730
664sub draw { } 731sub draw { }
665 732
666############################################################################# 733#############################################################################
667 734
668package CFClient::UI::Container; 735package CFPlus::UI::Container;
669 736
670our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
671 738
672sub new { 739sub new {
673 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
674 741
675 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
684 if $children; 751 if $children;
685 752
686 $self 753 $self
687} 754}
688 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
689sub add { 764sub add {
690 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
691 766
692 $_->set_parent ($self) 767 $_->set_parent ($self)
693 for @widgets; 768 for @widgets;
… …
753 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
754} 829}
755 830
756############################################################################# 831#############################################################################
757 832
758package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
759 834
760our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
761 836
762sub new { 837sub new {
763 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
764 839
765 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766 841
767 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
768} 843}
769 844
770sub add { 845sub add {
771 my ($self, $child) = @_; 846 my ($self, $child) = @_;
772 847
773 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
776} 850}
777 851
778sub remove { 852sub remove {
779 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
780 854
781 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
782 856
783 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 858 unless @{$self->{children}};
785} 859}
786 860
787sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
788 862
789sub size_request { 863sub size_request {
790 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
791} 865}
792 866
793sub size_allocate { 867sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
795 869
796 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
797} 873}
798 874
799############################################################################# 875#############################################################################
800 876
801# back-buffered drawing area 877# back-buffered drawing area
802 878
803package CFClient::UI::Window; 879package CFPlus::UI::Window;
804 880
805our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
806 882
807use CFClient::OpenGL; 883use CFPlus::OpenGL;
808 884
809sub new { 885sub new {
810 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
811 887
812 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
817 893
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 895 $self->SUPER::update;
820} 896}
821 897
822sub size_allocate { 898sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
824 900
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
827} 904}
828 905
829sub _render { 906sub _render {
830 my ($self) = @_; 907 my ($self) = @_;
831 908
… …
833} 910}
834 911
835sub render_child { 912sub render_child {
836 my ($self) = @_; 913 my ($self) = @_;
837 914
838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
839 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
841 918
842 { 919 {
843 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
844 921
845 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
847 } 926 }
848
849 $self->_render;
850 }; 927 };
851} 928}
852 929
853sub _draw { 930sub _draw {
854 my ($self) = @_; 931 my ($self) = @_;
855
856 my ($w, $h) = @$self{qw(w h)};
857 932
858 my $tex = $self->{texture} 933 my $tex = $self->{texture}
859 or return; 934 or return;
860 935
861 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
864 939
865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
866 941
867 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
868} 943}
869 944
870############################################################################# 945#############################################################################
871 946
872package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
873 948
874our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
875 950
876sub new { 951sub new {
877 my $class = shift; 952 my $class = shift;
878 953
879 $class->SUPER::new ( 954 $class->SUPER::new (
… …
892 $h = 10 if $self->{scroll_y}; 967 $h = 10 if $self->{scroll_y};
893 968
894 ($w, $h) 969 ($w, $h)
895} 970}
896 971
897sub size_allocate { 972sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
899 974
900 my $child = $self->child; 975 my $child = $self->child;
901 976
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 979
905 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
906 $self->update; 981 $self->update;
982
983 1
907} 984}
908 985
909sub set_offset { 986sub set_offset {
910 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
911 988
… …
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 1016 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 1018 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1020 }
944} 1021}
945 1022
946sub _render { 1023sub _render {
947 my ($self) = @_; 1024 my ($self) = @_;
948 1025
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1028
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1030
954 $self->SUPER::_render; 1031 $self->SUPER::_render;
955} 1032}
956 1033
957############################################################################# 1034#############################################################################
958 1035
959package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
960 1037
961our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
962 1039
963sub new { 1040sub new {
964 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
965 1042
966 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
967 1044
968 my $self; 1045 my $self;
969 1046
970 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
971 vertical => 1, 1057 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1059 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
975 }, 1062 },
976 ; 1063 ;
977 1064
978 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1067 can_events => 1,
980 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
981 %arg, 1072 %arg,
982 ); 1073 );
983 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
985 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
986 1080
987 $self 1081 $self
988} 1082}
1083
1084#TODO# update range on size_allocate depending on child
989 1085
990sub add { 1086sub add {
991 my ($self, $widget) = @_; 1087 my ($self, $widget) = @_;
992 1088
993 $self->{vp}->add ($self->{child} = $widget); 1089 $self->{vp}->add ($self->{child} = $widget);
994} 1090}
995 1091
1092sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_;
1094
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev);
1098
1099 1
1100}
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1114}
1115
996sub update { 1116sub update {
997 my ($self) = @_; 1117 my ($self) = @_;
998 1118
999 $self->SUPER::update; 1119 $self->SUPER::update;
1000 1120 $self->update_slider;
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1121}
1005 1122
1006sub size_allocate { 1123sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1008 1125
1126 $self->update_slider;
1009 $self->SUPER::size_allocate ($w, $h); 1127 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1128}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1129
1018############################################################################# 1130#############################################################################
1019 1131
1020package CFClient::UI::Frame; 1132package CFPlus::UI::Frame;
1021 1133
1022our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1023 1135
1024use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1025 1137
1026sub new { 1138sub new {
1027 my $class = shift; 1139 my $class = shift;
1028 1140
1029 $class->SUPER::new ( 1141 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1167 $self->SUPER::_draw;
1056} 1168}
1057 1169
1058############################################################################# 1170#############################################################################
1059 1171
1060package CFClient::UI::FancyFrame; 1172package CFPlus::UI::FancyFrame;
1061 1173
1062our @ISA = CFClient::UI::Bin::; 1174our @ISA = CFPlus::UI::Bin::;
1063 1175
1064use CFClient::OpenGL; 1176use CFPlus::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1177
1074sub new { 1178sub new {
1075 my ($class, %arg) = @_; 1179 my ($class, %arg) = @_;
1076 1180
1077 my $title = delete $arg{title}; 1181 if ((exists $arg{label}) && !ref $arg{label}) {
1182 $arg{label} = new CFPlus::UI::Label
1183 align => 1,
1184 valign => 0,
1185 text => $arg{label},
1186 fontsize => ($arg{border} || 0.8) * 0.75;
1187 }
1188
1189 my $self = $class->SUPER::new (
1190 # label => "",
1191 fg => [0.6, 0.3, 0.1],
1192 border => 0.8,
1193 style => 'single',
1194 %arg,
1195 );
1196
1197 $self
1198}
1199
1200sub add {
1201 my ($self, @widgets) = @_;
1202
1203 $self->SUPER::add (@widgets);
1204 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1205}
1206
1207sub border {
1208 int $_[0]{border} * $::FONTSIZE
1209}
1210
1211sub size_request {
1212 my ($self) = @_;
1213
1214 ($self->{label_w}, undef) = $self->{label}->size_request
1215 if $self->{label};
1216
1217 my ($w, $h) = $self->SUPER::size_request;
1218
1219 (
1220 $w + $self->border * 2,
1221 $h + $self->border * 2,
1222 )
1223}
1224
1225sub invoke_size_allocate {
1226 my ($self, $w, $h) = @_;
1227
1228 my $border = $self->border;
1229
1230 $w -= List::Util::max 0, $border * 2;
1231 $h -= List::Util::max 0, $border * 2;
1232
1233 if (my $label = $self->{label}) {
1234 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1235 $label->{h} = List::Util::min $h, $border;
1236 $label->invoke_size_allocate ($label->{w}, $label->{h});
1237 }
1238
1239 $self->child->configure ($border, $border, $w, $h);
1240
1241 1
1242}
1243
1244sub _draw {
1245 my ($self) = @_;
1246
1247 my $child = $self->{children}[0];
1248
1249 my $border = $self->border;
1250 my ($w, $h) = ($self->{w}, $self->{h});
1251
1252 $child->draw;
1253
1254 glColor @{$self->{fg}};
1255 glBegin GL_LINE_STRIP;
1256 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1257 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1258 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1259 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1260 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1261 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1262 glEnd;
1263
1264 if ($self->{label}) {
1265 glTranslate $border * 2, 0;
1266 $self->{label}->_draw;
1267 }
1268}
1269
1270#############################################################################
1271
1272package CFPlus::UI::Toplevel;
1273
1274our @ISA = CFPlus::UI::Bin::;
1275
1276use CFPlus::OpenGL;
1277
1278my $bg =
1279 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1280 mipmap => 1, wrap => 1;
1281
1282my @border =
1283 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1285
1286sub new {
1287 my ($class, %arg) = @_;
1078 1288
1079 my $self = $class->SUPER::new ( 1289 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1290 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1291 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1292 border => 0.6,
1083 can_events => 1, 1293 can_events => 1,
1084 min_w => 16, 1294 min_w => 64,
1085 min_h => 16, 1295 min_h => 32,
1086 %arg, 1296 %arg,
1087 ); 1297 );
1088 1298
1089 $self->{title} = new CFClient::UI::Label 1299 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1300 align => 0,
1091 valign => 1, 1301 valign => 1,
1092 text => $title, 1302 text => $self->{title},
1093 fontsize => $self->{border} 1303 fontsize => $self->{border},
1094 if defined $title; 1304 if exists $self->{title};
1305
1306 if ($self->{has_close_button}) {
1307 $self->{close_button} =
1308 new CFPlus::UI::ImageButton
1309 path => 'x1_close.png',
1310 on_activate => sub { $self->emit ("delete") };
1311
1312 $self->CFPlus::UI::Container::add ($self->{close_button});
1313 }
1095 1314
1096 $self 1315 $self
1097} 1316}
1098 1317
1099sub add { 1318sub add {
1100 my ($self, @widgets) = @_; 1319 my ($self, @widgets) = @_;
1101 1320
1102 $self->SUPER::add (@widgets); 1321 $self->SUPER::add (@widgets);
1322 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1323 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1324}
1105 1325
1106sub border { 1326sub border {
1107 int $_[0]{border} * $::FONTSIZE 1327 int $_[0]{border} * $::FONTSIZE
1108} 1328}
1109 1329
1110sub size_request { 1330sub size_request {
1111 my ($self) = @_; 1331 my ($self) = @_;
1112 1332
1113 $self->{title}->size_request 1333 $self->{title_widget}->size_request
1114 if $self->{title}; 1334 if $self->{title_widget};
1335
1336 $self->{close_button}->size_request
1337 if $self->{close_button};
1115 1338
1116 my ($w, $h) = $self->SUPER::size_request; 1339 my ($w, $h) = $self->SUPER::size_request;
1117 1340
1118 ( 1341 (
1119 $w + $self->border * 2, 1342 $w + $self->border * 2,
1120 $h + $self->border * 2, 1343 $h + $self->border * 2,
1121 ) 1344 )
1122} 1345}
1123 1346
1124sub size_allocate { 1347sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1348 my ($self, $w, $h) = @_;
1126 1349
1127 if ($self->{title}) { 1350 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1351 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1352 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1353 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1354 }
1132 1355
1133 my $border = $self->border; 1356 my $border = $self->border;
1134 1357
1135 $h -= List::Util::max 0, $border * 2; 1358 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1359 $w -= List::Util::max 0, $border * 2;
1360
1361 $self->child->configure ($border, $border, $w, $h);
1362
1363 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1364 if $self->{close_button};
1365
1366 1
1367}
1368
1369sub invoke_delete {
1370 my ($self) = @_;
1371
1372 $self->hide;
1137 1373
1138 $self->child->configure ($border, $border, $w, $h); 1374 1
1139} 1375}
1140 1376
1141sub button_down { 1377sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1378 my ($self, $ev, $x, $y) = @_;
1143 1379
1144 my ($w, $h) = @$self{qw(w h)}; 1380 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1381 my $border = $self->border;
1146 1382
… …
1177 1413
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1414 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1415
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1416 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1417 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1418 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1419 };
1184 } else { 1420 } else {
1185 return 0; 1421 return 0;
1186 } 1422 }
1187 1423
1188 1 1424 1
1189} 1425}
1190 1426
1191sub button_up { 1427sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1428 my ($self, $ev, $x, $y) = @_;
1193 1429
1194 !!delete $self->{motion} 1430 ! ! delete $self->{motion}
1195} 1431}
1196 1432
1197sub mouse_motion { 1433sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1434 my ($self, $ev, $x, $y) = @_;
1199 1435
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1436 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1437
1202 !!$self->{motion} 1438 ! ! $self->{motion}
1439}
1440
1441sub invoke_visibility_change {
1442 my ($self, $visible) = @_;
1443
1444 delete $self->{motion} unless $visible;
1445
1446 0
1203} 1447}
1204 1448
1205sub _draw { 1449sub _draw {
1206 my ($self) = @_; 1450 my ($self) = @_;
1207 1451
… …
1233 1477
1234 glDisable GL_TEXTURE_2D; 1478 glDisable GL_TEXTURE_2D;
1235 1479
1236 $child->draw; 1480 $child->draw;
1237 1481
1238 if ($self->{title}) { 1482 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1483 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1484 $self->{title_widget}->_draw;
1485
1486 glTranslate 0, - ($border - $self->{h});
1241 } 1487 }
1488
1489 $self->{close_button}->draw
1490 if $self->{close_button};
1242} 1491}
1243 1492
1244############################################################################# 1493#############################################################################
1245 1494
1246package CFClient::UI::Table; 1495package CFPlus::UI::Table;
1247 1496
1248our @ISA = CFClient::UI::Base::; 1497our @ISA = CFPlus::UI::Base::;
1249 1498
1250use List::Util qw(max sum); 1499use List::Util qw(max sum);
1251 1500
1252use CFClient::OpenGL; 1501use CFPlus::OpenGL;
1253 1502
1254sub new { 1503sub new {
1255 my $class = shift; 1504 my $class = shift;
1256 1505
1257 $class->SUPER::new ( 1506 $class->SUPER::new (
1258 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1259 @_, 1509 @_,
1260 ) 1510 )
1261} 1511}
1262 1512
1263sub children { 1513sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1515}
1266 1516
1267sub add { 1517sub add {
1268 my ($self, $x, $y, $child) = @_; 1518 my ($self) = shift;
1269 1519
1520 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1522 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1523 $self->{children}[$y][$x] = $child;
1524 }
1272 1525
1526 $self->{force_realloc} = 1;
1527 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1528 $self->realloc;
1529}
1530
1531sub remove {
1532 my ($self, $child) = @_;
1533
1534 # TODO: not yet implemented
1274} 1535}
1275 1536
1276# TODO: move to container class maybe? send children a signal on removal? 1537# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1538sub clear {
1278 my ($self) = @_; 1539 my ($self) = @_;
… …
1319 (sum @$ws), 1580 (sum @$ws),
1320 (sum @$hs), 1581 (sum @$hs),
1321 ) 1582 )
1322} 1583}
1323 1584
1324sub size_allocate { 1585sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1586 my ($self, $w, $h) = @_;
1326 1587
1327 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1328 1589
1329 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1330 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1331 1592
1332 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1333 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1334 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1335 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1336 1597
1337 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1599
1341 CFClient::UI::harmonize $ws; 1600 CFPlus::UI::harmonize $ws;
1601
1602 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1;
1605
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607
1342 CFClient::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1343 1609
1344 my $y; 1610 my $y;
1345 1611
1346 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1613 my $row = $self->{children}[$r]
… …
1361 } 1627 }
1362 1628
1363 $y += $row_h; 1629 $y += $row_h;
1364 } 1630 }
1365 1631
1632 1
1366} 1633}
1367 1634
1368sub find_widget { 1635sub find_widget {
1369 my ($self, $x, $y) = @_; 1636 my ($self, $x, $y) = @_;
1370 1637
… …
1389 } 1656 }
1390} 1657}
1391 1658
1392############################################################################# 1659#############################################################################
1393 1660
1394package CFClient::UI::Box; 1661package CFPlus::UI::Box;
1395 1662
1396our @ISA = CFClient::UI::Container::; 1663our @ISA = CFPlus::UI::Container::;
1397 1664
1398sub size_request { 1665sub size_request {
1399 my ($self) = @_; 1666 my ($self) = @_;
1400 1667
1401 $self->{vertical} 1668 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1674 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1675 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1676 )
1410} 1677}
1411 1678
1412sub size_allocate { 1679sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1680 my ($self, $w, $h) = @_;
1414 1681
1415 my $space = $self->{vertical} ? $h : $w; 1682 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1683 my @children = $self->visible_children;
1417 1684
1418 my @req; 1685 my @req;
1419 1686
1420 if ($self->{homogeneous}) { 1687 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1688 @req = ($space / (@children || 1)) x @children;
1422 } else { 1689 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1690 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1691 my $req = List::Util::sum @req;
1425 1692
1426 if ($req > $space) { 1693 if ($req > $space) {
1427 # ah well, not enough space 1694 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1695 $_ *= $space / $req for @req;
1429 } else { 1696 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1697 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1698
1432 $space = ($space - $req) / $expand; # remaining space to give away 1699 $space = ($space - $req) / $expand; # remaining space to give away
1433 1700
1434 $req[$_] += $space * $children->[$_]{expand} 1701 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1702 for 0 .. $#children;
1436 } 1703 }
1437 } 1704 }
1438 1705
1439 CFClient::UI::harmonize \@req; 1706 CFPlus::UI::harmonize \@req;
1440 1707
1441 my $pos = 0; 1708 my $pos = 0;
1442 for (0 .. $#$children) { 1709 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1710 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1711 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1712
1446 $pos += $alloc; 1713 $pos += $alloc;
1447 } 1714 }
1448 1715
1449 1 1716 1
1450} 1717}
1451 1718
1452############################################################################# 1719#############################################################################
1453 1720
1454package CFClient::UI::HBox; 1721package CFPlus::UI::HBox;
1455 1722
1456our @ISA = CFClient::UI::Box::; 1723our @ISA = CFPlus::UI::Box::;
1457 1724
1458sub new { 1725sub new {
1459 my $class = shift; 1726 my $class = shift;
1460 1727
1461 $class->SUPER::new ( 1728 $class->SUPER::new (
… …
1464 ) 1731 )
1465} 1732}
1466 1733
1467############################################################################# 1734#############################################################################
1468 1735
1469package CFClient::UI::VBox; 1736package CFPlus::UI::VBox;
1470 1737
1471our @ISA = CFClient::UI::Box::; 1738our @ISA = CFPlus::UI::Box::;
1472 1739
1473sub new { 1740sub new {
1474 my $class = shift; 1741 my $class = shift;
1475 1742
1476 $class->SUPER::new ( 1743 $class->SUPER::new (
… …
1479 ) 1746 )
1480} 1747}
1481 1748
1482############################################################################# 1749#############################################################################
1483 1750
1484package CFClient::UI::Label; 1751package CFPlus::UI::Label;
1485 1752
1486our @ISA = CFClient::UI::DrawBG::; 1753our @ISA = CFPlus::UI::DrawBG::;
1487 1754
1488use CFClient::OpenGL; 1755use CFPlus::OpenGL;
1489 1756
1490sub new { 1757sub new {
1491 my ($class, %arg) = @_; 1758 my ($class, %arg) = @_;
1492 1759
1493 my $self = $class->SUPER::new ( 1760 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1763 #active_bg => none
1497 #font => default_font 1764 #font => default_font
1498 #text => initial text 1765 #text => initial text
1499 #markup => initial narkup 1766 #markup => initial narkup
1500 #max_w => maximum pixel width 1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1501 ellipsise => 3, # end 1769 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1770 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1771 fontsize => 1,
1504 align => -1, 1772 align => -1,
1505 valign => -1, 1773 valign => -1,
1506 padding_x => 2, 1774 padding_x => 2,
1507 padding_y => 2, 1775 padding_y => 2,
1508 can_events => 0, 1776 can_events => 0,
1509 %arg 1777 %arg
1510 ); 1778 );
1511 1779
1512 if (exists $self->{template}) { 1780 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1781 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1782 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1783 $self->{template} = $layout;
1516 } 1784 }
1517 1785
1518 if (exists $self->{markup}) { 1786 if (exists $self->{markup}) {
… …
1522 } 1790 }
1523 1791
1524 $self 1792 $self
1525} 1793}
1526 1794
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1795sub update {
1538 my ($self) = @_; 1796 my ($self) = @_;
1539 1797
1540 delete $self->{texture}; 1798 delete $self->{texture};
1541 $self->SUPER::update; 1799 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1810 my ($self, $text) = @_;
1553 1811
1554 return if $self->{text} eq "T$text"; 1812 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1813 $self->{text} = "T$text";
1556 1814
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1815 $self->{layout}->set_text ($text);
1816
1559 delete $self->{req_h}; 1817 delete $self->{size_req};
1560
1561 $self->realloc; 1818 $self->realloc;
1562 $self->update; 1819 $self->update;
1563} 1820}
1564 1821
1565sub set_markup { 1822sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 1825 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1826 $self->{text} = "M$markup";
1570 1827
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1828 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1829
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1830 $self->{layout}->set_markup ($markup);
1831
1575 delete $self->{req_h}; 1832 delete $self->{size_req};
1576
1577 $self->realloc; 1833 $self->realloc;
1578 $self->update; 1834 $self->update;
1579} 1835}
1580 1836
1581sub size_request { 1837sub size_request {
1582 my ($self) = @_; 1838 my ($self) = @_;
1583 1839
1584 if (exists $self->{req_h}) { 1840 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1841 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1842 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1843 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1844 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1845 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1846
1593 my ($w, $h) = $self->{layout}->size; 1847 my ($w, $h) = $self->{layout}->size;
1594 1848
1595 if (exists $self->{template}) { 1849 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font}; 1850 $self->{template}->set_font ($self->{font}) if $self->{font};
1851 $self->{template}->set_width ($self->{max_w} || -1);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1853
1599 my ($w2, $h2) = $self->{template}->size; 1854 my ($w2, $h2) = $self->{template}->size;
1600 1855
1601 $w = List::Util::max $w, $w2; 1856 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1857 $h = List::Util::max $h, $h2;
1603 } 1858 }
1604 1859
1605 ($w, $h) 1860 [$w, $h]
1606 } 1861 };
1607}
1608 1862
1863 @{ $self->{size_req} }
1864}
1865
1866sub baseline_shift {
1867 $_[0]{layout}->descent
1868}
1869
1609sub size_allocate { 1870sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1871 my ($self, $w, $h) = @_;
1611 1872
1612 delete $self->{ox}; 1873 delete $self->{ox};
1613 1874
1614 delete $self->{texture} 1875 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1876 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1877
1878 1
1616} 1879}
1617 1880
1618sub set_fontsize { 1881sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1882 my ($self, $fontsize) = @_;
1620 1883
1621 $self->{fontsize} = $fontsize; 1884 $self->{fontsize} = $fontsize;
1885 delete $self->{size_req};
1622 delete $self->{texture}; 1886 delete $self->{texture};
1623 1887
1624 $self->realloc; 1888 $self->realloc;
1625} 1889}
1626 1890
1891sub reconfigure {
1892 my ($self) = @_;
1893
1894 delete $self->{size_req};
1895 delete $self->{texture};
1896
1897 $self->SUPER::reconfigure;
1898}
1899
1627sub _draw { 1900sub _draw {
1628 my ($self) = @_; 1901 my ($self) = @_;
1629 1902
1630 $self->SUPER::_draw; # draw background, if applicable 1903 $self->SUPER::_draw; # draw background, if applicable
1631 1904
1632 my $tex = $self->{texture} ||= do { 1905 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 1906 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1907 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 1908 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1909 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1910 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1911 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 1912
1640 new_from_layout CFClient::Texture $self->{layout} 1913 [$self->{layout}->size]
1641 }; 1914 };
1642 1915
1643 unless (exists $self->{ox}) { 1916 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1917 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1918 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 1919 : ($self->{w} - $size->[0]) * 0.5);
1647 1920
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 1923 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 1924 };
1652 1925
1653 glEnable GL_TEXTURE_2D; 1926 my $w = List::Util::min $self->{w} + 4, $size->[0];
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1927 my $h = List::Util::min $self->{h} + 2, $size->[1];
1655 1928
1656 if ($tex->{format} == GL_ALPHA) { 1929 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1657 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659 } else {
1660 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1661 }
1662
1663 glDisable GL_TEXTURE_2D;
1664} 1930}
1665 1931
1666############################################################################# 1932#############################################################################
1667 1933
1668package CFClient::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
1669 1935
1670our @ISA = CFClient::UI::Label::; 1936our @ISA = CFPlus::UI::Label::;
1671 1937
1672use CFClient::OpenGL; 1938use CFPlus::OpenGL;
1673 1939
1674sub new { 1940sub new {
1675 my $class = shift; 1941 my $class = shift;
1676 1942
1677 $class->SUPER::new ( 1943 $class->SUPER::new (
… …
1681 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1682 can_hover => 1, 1948 can_hover => 1,
1683 can_focus => 1, 1949 can_focus => 1,
1684 valign => 0, 1950 valign => 0,
1685 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1686 #text => ... 1953 #text => ...
1954 #hidden => "*",
1687 @_ 1955 @_
1688 ) 1956 )
1689} 1957}
1690 1958
1691sub _set_text { 1959sub _set_text {
… …
1698 $self->{last_activity} = $::NOW; 1966 $self->{last_activity} = $::NOW;
1699 $self->{text} = $text; 1967 $self->{text} = $text;
1700 1968
1701 $text =~ s/./*/g if $self->{hidden}; 1969 $text =~ s/./*/g if $self->{hidden};
1702 $self->{layout}->set_text ("$text "); 1970 $self->{layout}->set_text ("$text ");
1703 delete $self->{req_h}; 1971 delete $self->{size_req};
1704 1972
1705 $self->_emit (changed => $self->{text}); 1973 $self->emit (changed => $self->{text});
1706 1974
1707 $self->realloc; 1975 $self->realloc;
1708 $self->update; 1976 $self->update;
1709} 1977}
1710 1978
… …
1725 my ($w, $h) = $self->SUPER::size_request; 1993 my ($w, $h) = $self->SUPER::size_request;
1726 1994
1727 ($w + 1, $h) # add 1 for cursor 1995 ($w + 1, $h) # add 1 for cursor
1728} 1996}
1729 1997
1730sub key_down { 1998sub invoke_key_down {
1731 my ($self, $ev) = @_; 1999 my ($self, $ev) = @_;
1732 2000
1733 my $mod = $ev->{mod}; 2001 my $mod = $ev->{mod};
1734 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1735 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1736 2004
1737 my $text = $self->get_text; 2005 my $text = $self->get_text;
2006
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1738 2008
1739 if ($uni == 8) { 2009 if ($uni == 8) {
1740 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1741 } elsif ($uni == 127) { 2011 } elsif ($uni == 127) {
1742 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1743 } elsif ($sym == CFClient::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1744 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1745 } elsif ($sym == CFClient::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1746 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1747 } elsif ($sym == CFClient::SDLK_HOME) { 2017 } elsif ($sym == CFPlus::SDLK_HOME) {
2018 # what a hack
2019 $self->{cursor} =
2020 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2021 ? length $1
2022 : 0;
2023 } elsif ($sym == CFPlus::SDLK_END) {
2024 # uh, again
2025 $self->{cursor} =
2026 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2027 ? $self->{cursor} + length $1
2028 : length $self->{text};
2029 } elsif ($uni == 21) { # ctrl-u
2030 $text = "";
1748 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1749 } elsif ($sym == CFClient::SDLK_END) {
1750 $self->{cursor} = length $text;
1751 } elsif ($uni == 27) { 2032 } elsif ($uni == 27) {
1752 $self->_emit ('escape'); 2033 $self->emit ('escape');
1753 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1754 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
1755 } else { 2038 } else {
1756 return 0; 2039 return 0;
1757 } 2040 }
1758 2041
1759 $self->_set_text ($text); 2042 $self->_set_text ($text);
1760 2043
1761 $self->realloc; 2044 $self->realloc;
2045 $self->update;
1762 2046
1763 1 2047 1
1764} 2048}
1765 2049
1766sub focus_in { 2050sub invoke_focus_in {
1767 my ($self) = @_; 2051 my ($self) = @_;
1768 2052
1769 $self->{last_activity} = $::NOW; 2053 $self->{last_activity} = $::NOW;
1770 2054
1771 $self->SUPER::focus_in; 2055 $self->SUPER::invoke_focus_in
1772} 2056}
1773 2057
1774sub button_down { 2058sub invoke_button_down {
1775 my ($self, $ev, $x, $y) = @_; 2059 my ($self, $ev, $x, $y) = @_;
1776 2060
1777 $self->SUPER::button_down ($ev, $x, $y); 2061 $self->SUPER::invoke_button_down ($ev, $x, $y);
1778 2062
1779 my $idx = $self->{layout}->xy_to_index ($x, $y); 2063 my $idx = $self->{layout}->xy_to_index ($x, $y);
1780 2064
1781 # byte-index to char-index 2065 # byte-index to char-index
1782 my $text = $self->{text}; 2066 my $text = $self->{text};
1783 utf8::encode $text; 2067 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1784 $self->{cursor} = length substr $text, 0, $idx; 2068 $self->{cursor} = length $text;
1785 2069
1786 $self->_set_text ($self->{text}); 2070 $self->_set_text ($self->{text});
1787 $self->update; 2071 $self->update;
1788 2072
1789 1 2073 1
1790} 2074}
1791 2075
1792sub mouse_motion { 2076sub invoke_mouse_motion {
1793 my ($self, $ev, $x, $y) = @_; 2077 my ($self, $ev, $x, $y) = @_;
1794# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2078# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1795 2079
1796 0 2080 1
1797} 2081}
1798 2082
1799sub _draw { 2083sub _draw {
1800 my ($self) = @_; 2084 my ($self) = @_;
1801 2085
… …
1828 utf8::encode $text; 2112 utf8::encode $text;
1829 2113
1830 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2114 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1831 } 2115 }
1832 2116
1833 glColor @{$self->{fg}};
1834 glBegin GL_LINES; 2117 glBegin GL_LINES;
1835 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2118 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1836 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1837 glEnd; 2120 glEnd;
1838 } 2121 }
1839} 2122}
1840 2123
2124#############################################################################
2125
1841package CFClient::UI::Entry; 2126package CFPlus::UI::Entry;
1842 2127
1843our @ISA = CFClient::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1844 2129
1845use CFClient::OpenGL; 2130use CFPlus::OpenGL;
1846 2131
1847sub key_down { 2132sub invoke_key_down {
1848 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1849 2134
1850 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1851 2136
1852 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1853 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1854 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
2140
1855 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1856 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
1857 $self->_emit (activate => $txt); 2143 $self->emit (activate => $txt);
1858 $self->update; 2144 $self->update;
1859 2145
1860 } elsif ($sym == CFClient::SDLK_UP) { 2146 } elsif ($sym == CFPlus::SDLK_UP) {
1861 if ($self->{history_pointer} < 0) { 2147 if ($self->{history_pointer} < 0) {
1862 $self->{history_saveback} = $self->get_text; 2148 $self->{history_saveback} = $self->get_text;
1863 } 2149 }
1864 if (@{$self->{history} || []} > 0) { 2150 if (@{$self->{history} || []} > 0) {
1865 $self->{history_pointer}++; 2151 $self->{history_pointer}++;
… …
1867 $self->{history_pointer} = @{$self->{history} || []} - 1; 2153 $self->{history_pointer} = @{$self->{history} || []} - 1;
1868 } 2154 }
1869 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2155 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1870 } 2156 }
1871 2157
1872 } elsif ($sym == CFClient::SDLK_DOWN) { 2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
1873 $self->{history_pointer}--; 2159 $self->{history_pointer}--;
1874 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1875 2161
1876 if ($self->{history_pointer} >= 0) { 2162 if ($self->{history_pointer} >= 0) {
1877 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2163 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1878 } else { 2164 } else {
1879 $self->set_text ($self->{history_saveback}); 2165 $self->set_text ($self->{history_saveback});
1880 } 2166 }
1881 2167
1882 } else { 2168 } else {
1883 return $self->SUPER::key_down ($ev) 2169 return $self->SUPER::invoke_key_down ($ev)
1884 } 2170 }
1885 2171
1886 1 2172 1
1887} 2173}
1888 2174
1889############################################################################# 2175#############################################################################
1890 2176
2177package CFPlus::UI::TextEdit;
2178
2179our @ISA = CFPlus::UI::EntryBase::;
2180
2181use CFPlus::OpenGL;
2182
2183sub move_cursor_ver {
2184 my ($self, $dy) = @_;
2185
2186 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2187
2188 $y += $dy;
2189
2190 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2191 $self->{cursor} = $index;
2192 delete $self->{cur_h};
2193 $self->update;
2194 return;
2195 }
2196}
2197
2198sub invoke_key_down {
2199 my ($self, $ev) = @_;
2200
2201 my $sym = $ev->{sym};
2202
2203 if ($sym == CFPlus::SDLK_UP) {
2204 $self->move_cursor_ver (-1);
2205 } elsif ($sym == CFPlus::SDLK_DOWN) {
2206 $self->move_cursor_ver (+1);
2207 } else {
2208 return $self->SUPER::invoke_key_down ($ev)
2209 }
2210
2211 1
2212}
2213
2214#############################################################################
2215
1891package CFClient::UI::Button; 2216package CFPlus::UI::Button;
1892 2217
1893our @ISA = CFClient::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
1894 2219
1895use CFClient::OpenGL; 2220use CFPlus::OpenGL;
1896 2221
1897my @tex = 2222my @tex =
1898 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1899 qw(b1_button_active.png); 2224 qw(b1_button_active.png);
1900 2225
1901sub new { 2226sub new {
1902 my $class = shift; 2227 my $class = shift;
1903 2228
… …
1912 can_events => 1, 2237 can_events => 1,
1913 @_ 2238 @_
1914 ) 2239 )
1915} 2240}
1916 2241
1917sub activate { }
1918
1919sub button_up { 2242sub invoke_button_up {
1920 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1921 2244
1922 $self->emit ("activate") 2245 $self->emit ("activate")
1923 if $x >= 0 && $x < $self->{w} 2246 if $x >= 0 && $x < $self->{w}
1924 && $y >= 0 && $y < $self->{h}; 2247 && $y >= 0 && $y < $self->{h};
… …
1942 $self->SUPER::_draw; 2265 $self->SUPER::_draw;
1943} 2266}
1944 2267
1945############################################################################# 2268#############################################################################
1946 2269
1947package CFClient::UI::CheckBox; 2270package CFPlus::UI::CheckBox;
1948 2271
1949our @ISA = CFClient::UI::DrawBG::; 2272our @ISA = CFPlus::UI::DrawBG::;
1950 2273
1951my @tex = 2274my @tex =
1952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1953 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2276 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1954 2277
1955use CFClient::OpenGL; 2278use CFPlus::OpenGL;
1956 2279
1957sub new { 2280sub new {
1958 my $class = shift; 2281 my $class = shift;
1959 2282
1960 $class->SUPER::new ( 2283 $class->SUPER::new (
… …
1974 my ($self) = @_; 2297 my ($self) = @_;
1975 2298
1976 (6) x 2 2299 (6) x 2
1977} 2300}
1978 2301
2302sub toggle {
2303 my ($self) = @_;
2304
2305 $self->{state} = !$self->{state};
2306 $self->emit (changed => $self->{state});
2307 $self->update;
2308}
2309
1979sub button_down { 2310sub invoke_button_down {
1980 my ($self, $ev, $x, $y) = @_; 2311 my ($self, $ev, $x, $y) = @_;
1981 2312
1982 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2313 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1983 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2314 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1984 $self->{state} = !$self->{state}; 2315 $self->toggle;
1985 $self->_emit (changed => $self->{state});
1986 } else { 2316 } else {
1987 return 0 2317 return 0
1988 } 2318 }
1989 2319
1990 1 2320 1
… …
2010 glDisable GL_TEXTURE_2D; 2340 glDisable GL_TEXTURE_2D;
2011} 2341}
2012 2342
2013############################################################################# 2343#############################################################################
2014 2344
2015package CFClient::UI::Image; 2345package CFPlus::UI::Image;
2016 2346
2017our @ISA = CFClient::UI::Base::; 2347our @ISA = CFPlus::UI::Base::;
2018 2348
2019use CFClient::OpenGL; 2349use CFPlus::OpenGL;
2020use Carp qw/confess/;
2021 2350
2022our %loaded_images; 2351our %texture_cache;
2023 2352
2024sub new { 2353sub new {
2025 my $class = shift; 2354 my $class = shift;
2026 2355
2027 my $self = $class->SUPER::new (can_events => 0, @_); 2356 my $self = $class->SUPER::new (
2357 can_events => 0,
2358 @_,
2359 );
2028 2360
2029 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2361 $self->{path} || $self->{tex}
2362 or Carp::croak "'path' or 'tex' attributes required";
2030 2363
2031 $loaded_images{$self->{image}} ||= 2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2032 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2365 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2033 2366
2034 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2367 CFPlus::weaken $texture_cache{$self->{path}};
2035 2368
2036 Scalar::Util::weaken $loaded_images{$self->{image}}; 2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2037
2038 $self->{aspect} = $tex->{w} / $tex->{h};
2039 2370
2040 $self 2371 $self
2041} 2372}
2042 2373
2374sub STORABLE_freeze {
2375 my ($self, $cloning) = @_;
2376
2377 $self->{path}
2378 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2379
2380 $self->{path}
2381}
2382
2383sub STORABLE_attach {
2384 my ($self, $cloning, $path) = @_;
2385
2386 $self->new (path => $path)
2387}
2388
2043sub size_request { 2389sub size_request {
2044 my ($self) = @_; 2390 my ($self) = @_;
2045 2391
2046 ($self->{tex}->{w}, $self->{tex}->{h}) 2392 ($self->{tex}{w}, $self->{tex}{h})
2047} 2393}
2048 2394
2049sub _draw { 2395sub _draw {
2050 my ($self) = @_; 2396 my ($self) = @_;
2051 2397
… …
2061 } 2407 }
2062 2408
2063 glEnable GL_TEXTURE_2D; 2409 glEnable GL_TEXTURE_2D;
2064 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2065 2411
2066 $tex->draw_quad_alpha (0, 0, $w, $h); 2412 $tex->draw_quad (0, 0, $w, $h);
2067 2413
2068 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2069} 2415}
2070 2416
2071############################################################################# 2417#############################################################################
2072 2418
2419package CFPlus::UI::ImageButton;
2420
2421our @ISA = CFPlus::UI::Image::;
2422
2423use CFPlus::OpenGL;
2424
2425my %textures;
2426
2427sub new {
2428 my $class = shift;
2429
2430 my $self = $class->SUPER::new (
2431 padding_x => 4,
2432 padding_y => 4,
2433 fg => [1, 1, 1],
2434 active_fg => [0, 0, 1],
2435 can_hover => 1,
2436 align => 0,
2437 valign => 0,
2438 can_events => 1,
2439 @_
2440 );
2441}
2442
2443sub invoke_button_up {
2444 my ($self, $ev, $x, $y) = @_;
2445
2446 $self->emit ("activate")
2447 if $x >= 0 && $x < $self->{w}
2448 && $y >= 0 && $y < $self->{h};
2449
2450 1
2451}
2452
2453#############################################################################
2454
2073package CFClient::UI::VGauge; 2455package CFPlus::UI::VGauge;
2074 2456
2075our @ISA = CFClient::UI::Base::; 2457our @ISA = CFPlus::UI::Base::;
2076 2458
2077use List::Util qw(min max); 2459use List::Util qw(min max);
2078 2460
2079use CFClient::OpenGL; 2461use CFPlus::OpenGL;
2080 2462
2081my %tex = ( 2463my %tex = (
2082 food => [ 2464 food => [
2083 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2084 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2085 ], 2467 ],
2086 grace => [ 2468 grace => [
2087 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2469 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2088 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2470 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2089 ], 2471 ],
2090 hp => [ 2472 hp => [
2091 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2092 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2093 ], 2475 ],
2094 mana => [ 2476 mana => [
2095 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2477 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2096 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2478 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2097 ], 2479 ],
2098); 2480);
2099 2481
2100# eg. VGauge->new (gauge => 'food'), default gauge: food 2482# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2160 my $ycut1 = max 0, min 1, $ycut; 2542 my $ycut1 = max 0, min 1, $ycut;
2161 my $ycut2 = max 0, min 1, $ycut - 1; 2543 my $ycut2 = max 0, min 1, $ycut - 1;
2162 2544
2163 my $h1 = $self->{h} * (1 - $ycut1); 2545 my $h1 = $self->{h} * (1 - $ycut1);
2164 my $h2 = $self->{h} * (1 - $ycut2); 2546 my $h2 = $self->{h} * (1 - $ycut2);
2547 my $h3 = $self->{h};
2548
2549 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2165 2550
2166 glEnable GL_BLEND; 2551 glEnable GL_BLEND;
2167 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2552 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2553 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2169 glEnable GL_TEXTURE_2D; 2554 glEnable GL_TEXTURE_2D;
… …
2188 2573
2189 if ($t3) { 2574 if ($t3) {
2190 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2575 glBindTexture GL_TEXTURE_2D, $t3->{name};
2191 glBegin GL_QUADS; 2576 glBegin GL_QUADS;
2192 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2577 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2193 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2578 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2194 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2579 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2195 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2580 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2196 glEnd; 2581 glEnd;
2197 } 2582 }
2198 2583
2199 glDisable GL_BLEND; 2584 glDisable GL_BLEND;
2200 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2201} 2586}
2202 2587
2203############################################################################# 2588#############################################################################
2204 2589
2205package CFClient::UI::Gauge; 2590package CFPlus::UI::Gauge;
2206 2591
2207our @ISA = CFClient::UI::VBox::; 2592our @ISA = CFPlus::UI::VBox::;
2208 2593
2209sub new { 2594sub new {
2210 my ($class, %arg) = @_; 2595 my ($class, %arg) = @_;
2211 2596
2212 my $self = $class->SUPER::new ( 2597 my $self = $class->SUPER::new (
… …
2214 can_hover => 1, 2599 can_hover => 1,
2215 can_events => 1, 2600 can_events => 1,
2216 %arg, 2601 %arg,
2217 ); 2602 );
2218 2603
2219 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2604 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2220 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2605 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2221 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2606 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2222 2607
2223 $self 2608 $self
2224} 2609}
2225 2610
2226sub set_fontsize { 2611sub set_fontsize {
… …
2247 $self->{value}->set_text ($val); 2632 $self->{value}->set_text ($val);
2248} 2633}
2249 2634
2250############################################################################# 2635#############################################################################
2251 2636
2252package CFClient::UI::Slider; 2637package CFPlus::UI::Slider;
2253 2638
2254use strict; 2639use strict;
2255 2640
2256use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2257 2642
2258our @ISA = CFClient::UI::DrawBG::; 2643our @ISA = CFPlus::UI::DrawBG::;
2259 2644
2260my @tex = 2645my @tex =
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2262 qw(s1_slider.png s1_slider_bg.png); 2647 qw(s1_slider.png s1_slider_bg.png);
2263 2648
2264sub new { 2649sub new {
2265 my $class = shift; 2650 my $class = shift;
2266 2651
… …
2287 $self->update; 2672 $self->update;
2288 2673
2289 $self 2674 $self
2290} 2675}
2291 2676
2292sub changed { }
2293
2294sub set_range { 2677sub set_range {
2295 my ($self, $range) = @_; 2678 my ($self, $range) = @_;
2296 2679
2297 ($range, $self->{range}) = ($self->{range}, $range); 2680 ($range, $self->{range}) = ($self->{range}, $range);
2298 2681
2299 $self->update
2300 if "@$range" ne "@{$self->{range}}"; 2682 if ("@$range" ne "@{$self->{range}}") {
2683 $self->update;
2684 $self->set_value ($self->{range}[0]);
2685 }
2301} 2686}
2302 2687
2303sub set_value { 2688sub set_value {
2304 my ($self, $value) = @_; 2689 my ($self, $value) = @_;
2305 2690
… …
2316 if $unit; 2701 if $unit;
2317 2702
2318 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2703 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2319 2704
2320 if ($value != $old_value) { 2705 if ($value != $old_value) {
2321 $self->_emit (changed => $value); 2706 $self->emit (changed => $value);
2322 $self->update; 2707 $self->update;
2323 } 2708 }
2324} 2709}
2325 2710
2326sub size_request { 2711sub size_request {
2327 my ($self) = @_; 2712 my ($self) = @_;
2328 2713
2329 ($self->{req_w}, $self->{req_h}) 2714 ($self->{req_w}, $self->{req_h})
2330} 2715}
2331 2716
2332sub button_down { 2717sub invoke_button_down {
2333 my ($self, $ev, $x, $y) = @_; 2718 my ($self, $ev, $x, $y) = @_;
2334 2719
2335 $self->SUPER::button_down ($ev, $x, $y); 2720 $self->SUPER::invoke_button_down ($ev, $x, $y);
2336 2721
2337 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2722 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2338 2723
2339 $self->mouse_motion ($ev, $x, $y) 2724 $self->invoke_mouse_motion ($ev, $x, $y)
2340} 2725}
2341 2726
2342sub mouse_motion { 2727sub invoke_mouse_motion {
2343 my ($self, $ev, $x, $y) = @_; 2728 my ($self, $ev, $x, $y) = @_;
2344 2729
2345 if ($GRAB == $self) { 2730 if ($GRAB == $self) {
2346 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2731 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2347 2732
… …
2353 } else { 2738 } else {
2354 return 0; 2739 return 0;
2355 } 2740 }
2356 2741
2357 1 2742 1
2743}
2744
2745sub invoke_mouse_wheel {
2746 my ($self, $ev) = @_;
2747
2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2749
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751
2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753
2754 ! ! $delta
2358} 2755}
2359 2756
2360sub update { 2757sub update {
2361 my ($self) = @_; 2758 my ($self) = @_;
2362 2759
… …
2411 glDisable GL_TEXTURE_2D; 2808 glDisable GL_TEXTURE_2D;
2412} 2809}
2413 2810
2414############################################################################# 2811#############################################################################
2415 2812
2416package CFClient::UI::ValSlider; 2813package CFPlus::UI::ValSlider;
2417 2814
2418our @ISA = CFClient::UI::HBox::; 2815our @ISA = CFPlus::UI::HBox::;
2419 2816
2420sub new { 2817sub new {
2421 my ($class, %arg) = @_; 2818 my ($class, %arg) = @_;
2422 2819
2423 my $range = delete $arg{range}; 2820 my $range = delete $arg{range};
2424 2821
2425 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2426 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2823 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2427 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2824 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2428 to_value => sub { shift }, 2825 to_value => sub { shift },
2429 from_value => sub { shift }, 2826 from_value => sub { shift },
2430 %arg, 2827 %arg,
2431 ); 2828 );
2432 2829
… …
2452sub set_range { shift->{slider}->set_range (@_) } 2849sub set_range { shift->{slider}->set_range (@_) }
2453sub set_value { shift->{slider}->set_value (@_) } 2850sub set_value { shift->{slider}->set_value (@_) }
2454 2851
2455############################################################################# 2852#############################################################################
2456 2853
2457package CFClient::UI::TextView; 2854package CFPlus::UI::TextScroller;
2458 2855
2459our @ISA = CFClient::UI::HBox::; 2856our @ISA = CFPlus::UI::HBox::;
2460 2857
2461use CFClient::OpenGL; 2858use CFPlus::OpenGL;
2462 2859
2463sub new { 2860sub new {
2464 my $class = shift; 2861 my $class = shift;
2465 2862
2466 my $self = $class->SUPER::new ( 2863 my $self = $class->SUPER::new (
2467 fontsize => 1, 2864 fontsize => 1,
2468 can_events => 0, 2865 can_events => 1,
2866 indent => 0,
2469 #font => default_font 2867 #font => default_font
2470 @_, 2868 @_,
2471 2869
2472 layout => (new CFClient::Layout 1), 2870 layout => (new CFPlus::Layout),
2473 par => [], 2871 par => [],
2872 max_par => 0,
2474 height => 0, 2873 height => 0,
2475 children => [ 2874 children => [
2476 (new CFClient::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2477 (new CFClient::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2478 ], 2877 ],
2479 ); 2878 );
2480 2879
2481 $self->{children}[1]->connect (changed => sub { $self->update }); 2880 $self->{children}[1]->connect (changed => sub { $self->update });
2482 2881
… …
2488 2887
2489 $self->{fontsize} = $fontsize; 2888 $self->{fontsize} = $fontsize;
2490 $self->reflow; 2889 $self->reflow;
2491} 2890}
2492 2891
2892sub size_request {
2893 my ($self) = @_;
2894
2895 my ($empty, $slider) = @{ $self->{children} };
2896
2897 local $self->{children} = [$empty, $slider];
2898 $self->SUPER::size_request
2899}
2900
2493sub size_allocate { 2901sub invoke_size_allocate {
2494 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2495 2903
2496 $self->SUPER::size_allocate ($w, $h); 2904 my ($empty, $slider, @other) = @{ $self->{children} };
2905 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2497 2906
2498 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2907 $self->{layout}->set_font ($self->{font}) if $self->{font};
2499 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2908 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2500 $self->{layout}->set_width ($self->{children}[0]{w}); 2909 $self->{layout}->set_width ($empty->{w});
2910 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501 2911
2502 $self->reflow; 2912 $self->reflow;
2503}
2504 2913
2505sub text_size { 2914 local $self->{children} = [$empty, $slider];
2915 $self->SUPER::invoke_size_allocate ($w, $h)
2916}
2917
2918sub invoke_mouse_wheel {
2506 my ($self, $text, $indent) = @_; 2919 my ($self, $ev) = @_;
2920
2921 return 0 unless $ev->{dy}; # only vertical movements
2922
2923 $self->{children}[1]->emit (mouse_wheel => $ev);
2924
2925 1
2926}
2927
2928sub get_layout {
2929 my ($self, $para) = @_;
2507 2930
2508 my $layout = $self->{layout}; 2931 my $layout = $self->{layout};
2509 2932
2933 $layout->set_font ($self->{font}) if $self->{font};
2934 $layout->set_foreground (@{$para->{fg}});
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2935 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511 $layout->set_width ($self->{children}[0]{w} - $indent); 2936 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2937 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512 $layout->set_markup ($text); 2938 $layout->set_markup ($para->{markup});
2939
2940 $layout->set_shapes (
2941 map
2942 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2943 @{$para->{widget}}
2513 2944 );
2945
2514 $layout->size 2946 $layout
2515} 2947}
2516 2948
2517sub reflow { 2949sub reflow {
2518 my ($self) = @_; 2950 my ($self) = @_;
2519 2951
… …
2526 2958
2527 # todo: base offset on lines or so, not on pixels 2959 # todo: base offset on lines or so, not on pixels
2528 $self->{children}[1]->set_value ($offset); 2960 $self->{children}[1]->set_value ($offset);
2529} 2961}
2530 2962
2963sub current_paragraph {
2964 my ($self) = @_;
2965
2966 $self->{top_paragraph} - 1
2967}
2968
2969sub scroll_to {
2970 my ($self, $para) = @_;
2971
2972 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2973
2974 $self->{scroll_to} = $para;
2975 $self->update;
2976}
2977
2531sub clear { 2978sub clear {
2532 my ($self) = @_; 2979 my ($self) = @_;
2980
2981 my (undef, undef, @other) = @{ $self->{children} };
2982 $self->remove ($_) for @other;
2533 2983
2534 $self->{par} = []; 2984 $self->{par} = [];
2535 $self->{height} = 0; 2985 $self->{height} = 0;
2536 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2986 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2537} 2987}
2538 2988
2539sub add_paragraph { 2989sub add_paragraph {
2540 my ($self, $color, $text, $indent) = @_; 2990 my $self = shift;
2541 2991
2542 for my $line (split /\n/, $text) { 2992 for my $para (@_) {
2543 my ($w, $h) = $self->text_size ($line); 2993 $para = {
2994 fg => [1, 1, 1, 1],
2995 indent => 0,
2996 markup => "",
2997 widget => [],
2998 ref $para ? %$para : (markup => $para),
2999 w => 1e10,
3000 wrapped => 1,
3001 };
3002
3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3004 push @{$self->{par}}, $para;
3005 }
3006
3007 if (my $max = $self->{max_par}) {
3008 shift @{$self->{par}} while @{$self->{par}} > $max;
3009 }
3010
3011 $self->{need_reflow}++;
3012 $self->update;
3013}
3014
3015sub scroll_to_bottom {
3016 my ($self) = @_;
3017
3018 $self->{scroll_to} = $#{$self->{par}};
3019 $self->update;
3020}
3021
3022sub force_uptodate {
3023 my ($self) = @_;
3024
3025 if (delete $self->{need_reflow}) {
3026 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3027
3028 my $height = 0;
3029
3030 for my $para (@{$self->{par}}) {
3031 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3032 my $layout = $self->get_layout ($para);
3033 my ($w, $h) = $layout->size;
3034
3035 $para->{w} = $w + $para->{indent};
3036 $para->{h} = $h;
3037 $para->{wrapped} = $layout->has_wrapped;
3038 }
3039
3040 $para->{y} = $height;
3041 $height += $para->{h};
3042 }
3043
2544 $self->{height} += $h; 3044 $self->{height} = $height;
2545 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2546 }
2547 3046
2548 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3047 delete $self->{texture};
3048 }
3049
3050 if (my $paridx = delete $self->{scroll_to}) {
3051 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3052 }
2549} 3053}
2550 3054
2551sub update { 3055sub update {
2552 my ($self) = @_; 3056 my ($self) = @_;
2553 3057
… …
2555 3059
2556 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2557 3061
2558 delete $self->{texture}; 3062 delete $self->{texture};
2559 3063
2560 $ROOT->on_post_alloc ($self, sub { 3064 $ROOT->on_post_alloc ($self => sub {
3065 $self->force_uptodate;
3066
2561 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2562 3068
2563 if (delete $self->{need_reflow}) {
2564 my $height = 0;
2565
2566 my $layout = $self->{layout};
2567
2568 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2569
2570 for (@{$self->{par}}) {
2571 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2572 $layout->set_width ($W - $_->[3]);
2573 $layout->set_markup ($_->[4]);
2574 my ($w, $h) = $layout->size;
2575 $_->[0] = $w + $_->[3];
2576 $_->[1] = $h;
2577 }
2578
2579 $height += $_->[1];
2580 }
2581
2582 $self->{height} = $height;
2583
2584 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2585
2586 delete $self->{texture};
2587 }
2588
2589 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2590 glClearColor 0, 0, 0, 0; 3070 glClearColor 0, 0, 0, 0;
2591 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2592 3072
3073 package CFPlus::UI::Base;
3074 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3075 (0, 0, $self->{w}, $self->{h});
3076
3077 my $top = int $self->{children}[1]{range}[0];
3078
3079 my $paridx = 0;
3080 my $top_paragraph;
2593 my $top = int $self->{children}[1]{range}[0]; 3081 my $top = int $self->{children}[1]{range}[0];
2594 3082
2595 my $y0 = $top; 3083 my $y0 = $top;
2596 my $y1 = $top + $H; 3084 my $y1 = $top + $H;
2597 3085
2598 my $y = 0;
2599
2600 my $layout = $self->{layout};
2601
2602 $layout->set_font ($self->{font}) if $self->{font};
2603
2604 glEnable GL_BLEND;
2605 #TODO# not correct in windows where rgba is forced off
2606 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2607
2608 for my $par (@{$self->{par}}) { 3086 for my $para (@{$self->{par}}) {
2609 my $h = $par->[1]; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2610 3089
2611 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2612 $layout->set_foreground (@{ $par->[2] }); 3091 my $layout = $self->get_layout ($para);
2613 $layout->set_width ($W - $par->[3]);
2614 $layout->set_markup ($par->[4]);
2615 3092
2616 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3093 $layout->render ($para->{indent}, $y - $y0);
2617 3094
2618 glRasterPos $par->[3], $y - $y0; 3095 if (my @w = @{ $para->{widget} }) {
2619 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3096 my @s = $layout->get_shapes;
3097
3098 for (@w) {
3099 my ($dx, $dy) = splice @s, 0, 2, ();
3100
3101 $_->{x} = $dx + $para->{indent};
3102 $_->{y} = $dy + $y - $y0;
3103
3104 $_->draw;
3105 }
3106 }
2620 } 3107 }
2621 3108
2622 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2623 } 3111 }
2624 3112
2625 glDisable GL_BLEND; 3113 $self->{top_paragraph} = $top_paragraph;
2626 }; 3114 };
2627 }); 3115 });
3116}
3117
3118sub reconfigure {
3119 my ($self) = @_;
3120
3121 $self->SUPER::reconfigure;
3122
3123 $_->{w} = 1e10 for @{ $self->{par} };
3124 $self->reflow;
2628} 3125}
2629 3126
2630sub _draw { 3127sub _draw {
2631 my ($self) = @_; 3128 my ($self) = @_;
2632 3129
… …
2635 glColor 0, 0, 0, 1; 3132 glColor 0, 0, 0, 1;
2636 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3133 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2637 glDisable GL_TEXTURE_2D; 3134 glDisable GL_TEXTURE_2D;
2638 3135
2639 $self->{children}[1]->draw; 3136 $self->{children}[1]->draw;
2640
2641} 3137}
2642 3138
2643############################################################################# 3139#############################################################################
2644 3140
2645package CFClient::UI::Animator; 3141package CFPlus::UI::Animator;
2646 3142
2647use CFClient::OpenGL; 3143use CFPlus::OpenGL;
2648 3144
2649our @ISA = CFClient::UI::Bin::; 3145our @ISA = CFPlus::UI::Bin::;
2650 3146
2651sub moveto { 3147sub moveto {
2652 my ($self, $x, $y) = @_; 3148 my ($self, $x, $y) = @_;
2653 3149
2654 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2682 glPopMatrix; 3178 glPopMatrix;
2683} 3179}
2684 3180
2685############################################################################# 3181#############################################################################
2686 3182
2687package CFClient::UI::Flopper; 3183package CFPlus::UI::Flopper;
2688 3184
2689our @ISA = CFClient::UI::Button::; 3185our @ISA = CFPlus::UI::Button::;
2690 3186
2691sub new { 3187sub new {
2692 my $class = shift; 3188 my $class = shift;
2693 3189
2694 my $self = $class->SUPER::new ( 3190 my $self = $class->SUPER::new (
… …
2706 $self->{other}->toggle_visibility; 3202 $self->{other}->toggle_visibility;
2707} 3203}
2708 3204
2709############################################################################# 3205#############################################################################
2710 3206
2711package CFClient::UI::Tooltip; 3207package CFPlus::UI::Tooltip;
2712 3208
2713our @ISA = CFClient::UI::Bin::; 3209our @ISA = CFPlus::UI::Bin::;
2714 3210
2715use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2716 3212
2717sub new { 3213sub new {
2718 my $class = shift; 3214 my $class = shift;
2719 3215
2720 $class->SUPER::new ( 3216 $class->SUPER::new (
… …
2723 ) 3219 )
2724} 3220}
2725 3221
2726sub set_tooltip_from { 3222sub set_tooltip_from {
2727 my ($self, $widget) = @_; 3223 my ($self, $widget) = @_;
3224
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
2728 3227
2729 my $tooltip = $widget->{tooltip}; 3228 my $tooltip = $widget->{tooltip};
2730 3229
2731 if ($ENV{CFPLUS_DEBUG} & 2) { 3230 if ($ENV{CFPLUS_DEBUG} & 2) {
2732 $tooltip .= "\n\n" . (ref $widget) . "\n" 3231 $tooltip .= "\n\n" . (ref $widget) . "\n"
2733 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3232 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734 . "req $widget->{req_w} $widget->{req_h}\n" 3233 . "req $widget->{req_w} $widget->{req_h}\n"
2735 . "visible $widget->{visible}"; 3234 . "visible $widget->{visible}";
2736 } 3235 }
2737 3236
3237 $tooltip =~ s/^\n+//;
3238 $tooltip =~ s/\n+$//;
3239
2738 $self->add (new CFClient::UI::Label 3240 $self->add (new CFPlus::UI::Label
2739 markup => $tooltip, 3241 markup => $tooltip,
2740 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2741 fontsize => 0.8, 3243 fontsize => 0.8,
2742 fg => [0, 0, 0, 1], 3244 style => 1, # FLAG_INVERSE
2743 ellipsise => 0, 3245 ellipsise => 0,
2744 font => ($widget->{tooltip_font} || $::FONT_PROP), 3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
2745 ); 3247 );
2746} 3248}
2747 3249
… …
2751 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3253 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2752 3254
2753 ($w + 4, $h + 4) 3255 ($w + 4, $h + 4)
2754} 3256}
2755 3257
2756sub size_allocate { 3258sub invoke_size_allocate {
2757 my ($self, $w, $h) = @_; 3259 my ($self, $w, $h) = @_;
2758 3260
2759 $self->SUPER::size_allocate ($w - 4, $h - 4); 3261 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2760} 3262}
2761 3263
2762sub visibility_change { 3264sub invoke_visibility_change {
2763 my ($self, $visible) = @_; 3265 my ($self, $visible) = @_;
2764 3266
2765 return unless $visible; 3267 return unless $visible;
2766 3268
2767 $self->{root}->on_post_alloc ("move_$self" => sub { 3269 $self->{root}->on_post_alloc ("move_$self" => sub {
2768 my $widget = $self->{owner} 3270 my $widget = $self->{owner}
2769 or return; 3271 or return;
2770 3272
3273 if ($widget->{visible}) {
2771 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3274 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772 3275
2773 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3276 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774 if $x + $self->{w} > $::WIDTH; 3277 if $x + $self->{w} > $self->{root}{w};
2775 3278
2776 $self->move_abs ($x, $y); 3279 $self->move_abs ($x, $y);
3280 } else {
3281 $self->hide;
3282 }
2777 }); 3283 });
2778} 3284}
2779 3285
2780sub _draw { 3286sub _draw {
2781 my ($self) = @_; 3287 my ($self) = @_;
… …
2805 $self->SUPER::_draw; 3311 $self->SUPER::_draw;
2806} 3312}
2807 3313
2808############################################################################# 3314#############################################################################
2809 3315
2810package CFClient::UI::Face; 3316package CFPlus::UI::Face;
2811 3317
2812our @ISA = CFClient::UI::Base::; 3318our @ISA = CFPlus::UI::DrawBG::;
2813 3319
2814use CFClient::OpenGL; 3320use CFPlus::OpenGL;
2815 3321
2816sub new { 3322sub new {
2817 my $class = shift; 3323 my $class = shift;
2818 3324
2819 my $self = $class->SUPER::new ( 3325 my $self = $class->SUPER::new (
… …
2821 can_events => 0, 3327 can_events => 0,
2822 @_, 3328 @_,
2823 ); 3329 );
2824 3330
2825 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
2826 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
2827 3333
2828 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
2829 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2830 hard => 1, 3336 hard => 1,
2831 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
2832 cb => sub { 3338 cb => sub {
3339 delete $self->{wait_face};
2833 ++$widget->{frame}; 3340 ++$widget->{frame};
2834 $widget->update; 3341 $widget->update;
2835 }, 3342 },
2836 ); 3343 );
2837 } 3344 }
… …
2854sub _draw { 3361sub _draw {
2855 my ($self) = @_; 3362 my ($self) = @_;
2856 3363
2857 return unless $::CONN; 3364 return unless $::CONN;
2858 3365
3366 $self->SUPER::_draw;
3367
2859 my $face; 3368 my $face;
2860 3369
2861 if ($self->{frame}) { 3370 if ($self->{frame}) {
2862 my $anim = $::CONN->{anim}[$self->{anim}]; 3371 my $anim = $::CONN->{anim}[$self->{anim}];
2863 3372
2864 $face = $anim->[ $self->{frame} % @$anim ] 3373 $face = $anim->[ $self->{frame} % @$anim ]
2865 if $anim && @$anim; 3374 if $anim && @$anim;
2866 } 3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
2867 3379
2868 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3380 my $tex = $::CONN->{texture}[$faceid];
2869 3381
2870 if ($tex) { 3382 if ($tex) {
2871 glEnable GL_TEXTURE_2D; 3383 glEnable GL_TEXTURE_2D;
2872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2873 glColor 0, 0, 0, 1; 3385 glColor 0, 0, 0, 1;
2874 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2875 glDisable GL_TEXTURE_2D; 3387 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
2876 } 3392 }
2877} 3393}
2878 3394
2879sub DESTROY { 3395sub destroy {
2880 my ($self) = @_; 3396 my ($self) = @_;
2881 3397
2882 $self->{timer}->cancel 3398 $self->{timer}->cancel
2883 if $self->{timer}; 3399 if $self->{timer};
2884 3400
2885 $self->SUPER::DESTROY; 3401 $self->SUPER::destroy;
2886} 3402}
2887 3403
2888############################################################################# 3404#############################################################################
2889 3405
2890package CFClient::UI::Buttonbar; 3406package CFPlus::UI::Buttonbar;
2891 3407
2892our @ISA = CFClient::UI::HBox::; 3408our @ISA = CFPlus::UI::HBox::;
2893 3409
2894# TODO: should actualyl wrap buttons and other goodies. 3410# TODO: should actually wrap buttons and other goodies.
2895 3411
2896############################################################################# 3412#############################################################################
2897 3413
2898package CFClient::UI::Menu; 3414package CFPlus::UI::Menu;
2899 3415
2900our @ISA = CFClient::UI::FancyFrame::; 3416our @ISA = CFPlus::UI::Toplevel::;
2901 3417
2902use CFClient::OpenGL; 3418use CFPlus::OpenGL;
2903 3419
2904sub new { 3420sub new {
2905 my $class = shift; 3421 my $class = shift;
2906 3422
2907 my $self = $class->SUPER::new ( 3423 my $self = $class->SUPER::new (
2908 items => [], 3424 items => [],
2909 z => 100, 3425 z => 100,
2910 @_, 3426 @_,
2911 ); 3427 );
2912 3428
2913 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3429 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2914 3430
2915 for my $item (@{ $self->{items} }) { 3431 for my $item (@{ $self->{items} }) {
2916 my ($widget, $cb) = @$item; 3432 my ($widget, $cb, $tooltip) = @$item;
2917 3433
2918 # handle various types of items, only text for now 3434 # handle various types of items, only text for now
2919 if (!ref $widget) { 3435 if (!ref $widget) {
3436 if ($widget =~ /\t/) {
3437 my ($left, $right) = split /\t/, $widget, 2;
3438
2920 $widget = new CFClient::UI::Label 3439 $widget = new CFPlus::UI::HBox
2921 can_hover => 1, 3440 can_hover => 1,
2922 can_events => 1, 3441 can_events => 1,
3442 tooltip => $tooltip,
3443 children => [
3444 (new CFPlus::UI::Label markup => $left, expand => 1),
3445 (new CFPlus::UI::Label markup => $right, align => +1),
3446 ],
3447 ;
3448
3449 } else {
3450 $widget = new CFPlus::UI::Label
3451 can_hover => 1,
3452 can_events => 1,
2923 text => $widget; 3453 markup => $widget,
3454 tooltip => $tooltip;
3455 }
2924 } 3456 }
2925 3457
2926 $self->{item}{$widget} = $item; 3458 $self->{item}{$widget} = $item;
2927 3459
2928 $self->{vbox}->add ($widget); 3460 $self->{vbox}->add ($widget);
… …
2933 3465
2934# popup given the event (must be a mouse button down event currently) 3466# popup given the event (must be a mouse button down event currently)
2935sub popup { 3467sub popup {
2936 my ($self, $ev) = @_; 3468 my ($self, $ev) = @_;
2937 3469
2938 $self->_emit ("popdown"); 3470 $self->emit ("popdown");
2939 3471
2940 # maybe save $GRAB? must be careful about events... 3472 # maybe save $GRAB? must be careful about events...
2941 $GRAB = $self; 3473 $GRAB = $self;
2942 $self->{button} = $ev->{button}; 3474 $self->{button} = $ev->{button};
2943 3475
2944 $self->show; 3476 $self->show;
2945 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3477 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2946} 3478}
2947 3479
2948sub mouse_motion { 3480sub invoke_mouse_motion {
2949 my ($self, $ev, $x, $y) = @_; 3481 my ($self, $ev, $x, $y) = @_;
2950 3482
2951 # TODO: should use vbox->find_widget or so 3483 # TODO: should use vbox->find_widget or so
2952 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3484 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2953 $self->{hover} = $self->{item}{$HOVER}; 3485 $self->{hover} = $self->{item}{$HOVER};
2954 3486
2955 0 3487 0
2956} 3488}
2957 3489
2958sub button_up { 3490sub invoke_button_up {
2959 my ($self, $ev, $x, $y) = @_; 3491 my ($self, $ev, $x, $y) = @_;
2960 3492
2961 if ($ev->{button} == $self->{button}) { 3493 if ($ev->{button} == $self->{button}) {
2962 undef $GRAB; 3494 undef $GRAB;
2963 $self->hide; 3495 $self->hide;
2964 3496
2965 $self->_emit ("popdown"); 3497 $self->emit ("popdown");
2966 $self->{hover}[1]->() if $self->{hover}; 3498 $self->{hover}[1]->() if $self->{hover};
2967 } else { 3499 } else {
2968 return 0 3500 return 0
2969 } 3501 }
2970 3502
2971 1 3503 1
2972} 3504}
2973 3505
2974############################################################################# 3506#############################################################################
2975 3507
2976package CFClient::UI::Multiplexer; 3508package CFPlus::UI::Multiplexer;
2977 3509
2978our @ISA = CFClient::UI::Container::; 3510our @ISA = CFPlus::UI::Container::;
2979 3511
2980sub new { 3512sub new {
2981 my $class = shift; 3513 my $class = shift;
2982 3514
2983 my $self = $class->SUPER::new ( 3515 my $self = $class->SUPER::new (
… …
2997 3529
2998 $self->{current} = $self->{children}[0] 3530 $self->{current} = $self->{children}[0]
2999 if @{ $self->{children} }; 3531 if @{ $self->{children} };
3000} 3532}
3001 3533
3534sub get_current_page {
3535 my ($self) = @_;
3536
3537 $self->{current}
3538}
3539
3002sub set_current_page { 3540sub set_current_page {
3003 my ($self, $page_or_widget) = @_; 3541 my ($self, $page_or_widget) = @_;
3004 3542
3005 my $widget = ref $page_or_widget 3543 my $widget = ref $page_or_widget
3006 ? $page_or_widget 3544 ? $page_or_widget
3007 : $self->{children}[$page_or_widget]; 3545 : $self->{children}[$page_or_widget];
3008 3546
3009 $self->{current} = $widget; 3547 $self->{current} = $widget;
3010 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3548 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011 3549
3012 $self->_emit (page_changed => $self->{current}); 3550 $self->emit (page_changed => $self->{current});
3013 3551
3014 $self->realloc; 3552 $self->realloc;
3015} 3553}
3016 3554
3017sub visible_children { 3555sub visible_children {
… …
3022 my ($self) = @_; 3560 my ($self) = @_;
3023 3561
3024 $self->{current}->size_request 3562 $self->{current}->size_request
3025} 3563}
3026 3564
3027sub size_allocate { 3565sub invoke_size_allocate {
3028 my ($self, $w, $h) = @_; 3566 my ($self, $w, $h) = @_;
3029 3567
3030 $self->{current}->configure (0, 0, $w, $h); 3568 $self->{current}->configure (0, 0, $w, $h);
3569
3570 1
3031} 3571}
3032 3572
3033sub _draw { 3573sub _draw {
3034 my ($self) = @_; 3574 my ($self) = @_;
3035 3575
3036 $self->{current}->draw; 3576 $self->{current}->draw;
3037} 3577}
3038 3578
3039############################################################################# 3579#############################################################################
3040 3580
3041package CFClient::UI::Notebook; 3581package CFPlus::UI::Notebook;
3042 3582
3043our @ISA = CFClient::UI::VBox::; 3583our @ISA = CFPlus::UI::VBox::;
3044 3584
3045sub new { 3585sub new {
3046 my $class = shift; 3586 my $class = shift;
3047 3587
3048 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
3049 buttonbar => (new CFClient::UI::Buttonbar), 3589 buttonbar => (new CFPlus::UI::Buttonbar),
3050 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3590 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3051 # filter => # will be put between multiplexer and $self 3591 # filter => # will be put between multiplexer and $self
3052 @_, 3592 @_,
3053 ); 3593 );
3054 3594
3055 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3595 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3059} 3599}
3060 3600
3061sub add { 3601sub add {
3062 my ($self, $title, $widget, $tooltip) = @_; 3602 my ($self, $title, $widget, $tooltip) = @_;
3063 3603
3064 Scalar::Util::weaken $self; 3604 CFPlus::weaken $self;
3065 3605
3066 $self->{buttonbar}->add (new CFClient::UI::Button 3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3067 markup => $title, 3607 markup => $title,
3068 tooltip => $tooltip, 3608 tooltip => $tooltip,
3069 on_activate => sub { $self->set_current_page ($widget) }, 3609 on_activate => sub { $self->set_current_page ($widget) },
3070 ); 3610 );
3071 3611
3072 $self->{multiplexer}->add ($widget); 3612 $self->{multiplexer}->add ($widget);
3073} 3613}
3074 3614
3615sub get_current_page {
3616 my ($self) = @_;
3617
3618 $self->{multiplexer}->get_current_page
3619}
3620
3075sub set_current_page { 3621sub set_current_page {
3076 my ($self, $page) = @_; 3622 my ($self, $page) = @_;
3077 3623
3078 $self->{multiplexer}->set_current_page ($page); 3624 $self->{multiplexer}->set_current_page ($page);
3079 $self->_emit (page_changed => $self->{multiplexer}{current}); 3625 $self->emit (page_changed => $self->{multiplexer}{current});
3080} 3626}
3081 3627
3082############################################################################# 3628#############################################################################
3083 3629
3630package CFPlus::UI::Selector;
3631
3632use utf8;
3633
3634our @ISA = CFPlus::UI::Button::;
3635
3636sub new {
3637 my $class = shift;
3638
3639 my $self = $class->SUPER::new (
3640 options => [], # [value, title, longdesc], ...
3641 value => undef,
3642 @_,
3643 );
3644
3645 $self->_set_value ($self->{value});
3646
3647 $self
3648}
3649
3650sub invoke_button_down {
3651 my ($self, $ev) = @_;
3652
3653 my @menu_items;
3654
3655 for (@{ $self->{options} }) {
3656 my ($value, $title, $tooltip) = @$_;
3657
3658 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3659 }
3660
3661 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3662}
3663
3664sub _set_value {
3665 my ($self, $value) = @_;
3666
3667 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3668 or return;
3669
3670 $self->{value} = $item->[0];
3671 $self->set_markup ("$item->[1] ⇓");
3672 $self->set_tooltip ($item->[2]);
3673}
3674
3675sub set_value {
3676 my ($self, $value) = @_;
3677
3678 return unless $self->{value} ne $value;
3679
3680 $self->_set_value ($value);
3681 $self->emit (changed => $value);
3682}
3683
3684#############################################################################
3685
3084package CFClient::UI::Statusbox; 3686package CFPlus::UI::Statusbox;
3085 3687
3086our @ISA = CFClient::UI::VBox::; 3688our @ISA = CFPlus::UI::VBox::;
3087 3689
3088sub new { 3690sub new {
3089 my $class = shift; 3691 my $class = shift;
3090 3692
3091 my $self = $class->SUPER::new ( 3693 my $self = $class->SUPER::new (
3092 fontsize => 0.8, 3694 fontsize => 0.8,
3093 @_, 3695 @_,
3094 ); 3696 );
3095 3697
3096 Scalar::Util::weaken (my $this = $self); 3698 CFPlus::weaken (my $this = $self);
3097 3699
3098 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3700 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3099 3701
3100 $self 3702 $self
3101} 3703}
… …
3103sub reorder { 3705sub reorder {
3104 my ($self) = @_; 3706 my ($self) = @_;
3105 my $NOW = Time::HiRes::time; 3707 my $NOW = Time::HiRes::time;
3106 3708
3107 # freeze display when hovering over any label 3709 # freeze display when hovering over any label
3108 return if $CFClient::UI::TOOLTIP->{owner} 3710 return if $CFPlus::UI::TOOLTIP->{owner}
3109 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3711 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3110 values %{ $self->{item} }; 3712 values %{ $self->{item} };
3111 3713
3112 while (my ($k, $v) = each %{ $self->{item} }) { 3714 while (my ($k, $v) = each %{ $self->{item} }) {
3113 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3715 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3114 } 3716 }
… …
3135 for ($short) { 3737 for ($short) {
3136 s/^\s+//; 3738 s/^\s+//;
3137 s/\s+/ /g; 3739 s/\s+/ /g;
3138 } 3740 }
3139 3741
3140 new CFClient::UI::Label 3742 new CFPlus::UI::Label
3141 markup => $short, 3743 markup => $short,
3142 tooltip => $item->{tooltip}, 3744 tooltip => $item->{tooltip},
3143 tooltip_font => $::FONT_PROP, 3745 tooltip_font => $::FONT_PROP,
3144 tooltip_width => 0.67, 3746 tooltip_width => 0.67,
3145 fontsize => $item->{fontsize} || $self->{fontsize}, 3747 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3183 $item->{count}++; 3785 $item->{count}++;
3184 } else { 3786 } else {
3185 $item->{count} = 1; 3787 $item->{count} = 1;
3186 $item->{text} = $item->{tooltip} = $text; 3788 $item->{text} = $item->{tooltip} = $text;
3187 } 3789 }
3188 $item->{id} = ++$self->{id}; 3790 $item->{id} += 0.2;#d#
3189 $item->{timeout} = $timeout; 3791 $item->{timeout} = $timeout;
3190 delete $item->{label}; 3792 delete $item->{label};
3191 } else { 3793 } else {
3192 $self->{item}{$group} = { 3794 $self->{item}{$group} = {
3193 id => ++$self->{id}, 3795 id => ++$self->{id},
… …
3199 count => 1, 3801 count => 1,
3200 %arg, 3802 %arg,
3201 }; 3803 };
3202 } 3804 }
3203 3805
3806 $ROOT->on_refresh (reorder => sub {
3204 $self->reorder; 3807 $self->reorder;
3808 });
3205} 3809}
3206 3810
3207sub reconfigure { 3811sub reconfigure {
3208 my ($self) = @_; 3812 my ($self) = @_;
3209 3813
… …
3212 3816
3213 $self->reorder; 3817 $self->reorder;
3214 $self->SUPER::reconfigure; 3818 $self->SUPER::reconfigure;
3215} 3819}
3216 3820
3217sub DESTROY { 3821sub destroy {
3218 my ($self) = @_; 3822 my ($self) = @_;
3219 3823
3220 $self->{timer}->cancel; 3824 $self->{timer}->cancel;
3221 3825
3222 $self->SUPER::DESTROY; 3826 $self->SUPER::destroy;
3223} 3827}
3224 3828
3225############################################################################# 3829#############################################################################
3226 3830
3227package CFClient::UI::Inventory;
3228
3229our @ISA = CFClient::UI::ScrolledWindow::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
3235 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3236 @_,
3237 );
3238
3239 $self
3240}
3241
3242sub set_items {
3243 my ($self, $items) = @_;
3244
3245 $self->{child}->clear;
3246 return unless $items;
3247
3248 my @items = sort {
3249 ($a->{type} <=> $b->{type})
3250 or ($a->{name} cmp $b->{name})
3251 } @$items;
3252
3253 $self->{real_items} = \@items;
3254
3255 my $row = 0;
3256 for my $item (@items) {
3257 CFClient::Item::update_widgets $item;
3258
3259 $self->{child}->add (0, $row, $item->{face_widget});
3260 $self->{child}->add (1, $row, $item->{desc_widget});
3261 $self->{child}->add (2, $row, $item->{weight_widget});
3262
3263 $row++;
3264 }
3265}
3266
3267#############################################################################
3268
3269package CFClient::UI::BindEditor;
3270
3271our @ISA = CFClient::UI::FancyFrame::;
3272
3273sub new {
3274 my $class = shift;
3275
3276 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3277
3278 $self->add (my $vb = new CFClient::UI::VBox);
3279
3280
3281 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3282 text => "start recording",
3283 tooltip => "Start/Stops recording of actions."
3284 ."All subsequent actions after the recording started will be captured."
3285 ."The actions are displayed after the record was stopped."
3286 ."To bind the action you have to click on the 'Bind' button",
3287 on_activate => sub {
3288 unless ($self->{recording}) {
3289 $self->start;
3290 } else {
3291 $self->stop;
3292 }
3293 });
3294
3295 $vb->add (new CFClient::UI::Label text => "Actions:");
3296 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3297
3298 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3299 $vb->add (my $hb = new CFClient::UI::HBox);
3300 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3301 $hb->add (new CFClient::UI::Button
3302 text => "bind",
3303 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3304 on_activate => sub {
3305 $self->ask_for_bind;
3306 });
3307
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add (new CFClient::UI::Button
3310 text => "ok",
3311 expand => 1,
3312 tooltip => "This closes the binding editor and saves the binding",
3313 on_activate => sub {
3314 $self->hide;
3315 $self->commit;
3316 });
3317
3318 $hb->add (new CFClient::UI::Button
3319 text => "cancel",
3320 expand => 1,
3321 tooltip => "This closes the binding editor without saving",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->{binding_cancel}->()
3325 if $self->{binding_cancel};
3326 });
3327
3328 $self->update_binding_widgets;
3329
3330 $self
3331}
3332
3333sub commit {
3334 my ($self) = @_;
3335 my ($mod, $sym, $cmds) = $self->get_binding;
3336 if ($sym != 0 && @$cmds > 0) {
3337 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3338 ."'. Don't forget 'Save Config'!");
3339 $self->{binding_change}->($mod, $sym, $cmds)
3340 if $self->{binding_change};
3341 } else {
3342 $::STATUSBOX->add ("No action bound, no key or action specified!");
3343 $self->{binding_cancel}->()
3344 if $self->{binding_cancel};
3345 }
3346}
3347
3348sub start {
3349 my ($self) = @_;
3350
3351 $self->{rec_btn}->set_text ("stop recording");
3352 $self->{recording} = 1;
3353 $self->clear_command_list;
3354 $::CONN->start_record if $::CONN;
3355}
3356
3357sub stop {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("start recording");
3361 $self->{recording} = 0;
3362
3363 my $rec;
3364 $rec = $::CONN->stop_record if $::CONN;
3365 return unless ref $rec eq 'ARRAY';
3366 $self->set_command_list ($rec);
3367}
3368
3369
3370sub ask_for_bind_and_commit {
3371 my ($self) = @_;
3372 $self->ask_for_bind (1);
3373}
3374
3375sub ask_for_bind {
3376 my ($self, $commit) = @_;
3377
3378 CFClient::Binder::open_binding_dialog (sub {
3379 my ($mod, $sym) = @_;
3380 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381 $self->update_binding_widgets;
3382 $self->commit if $commit;
3383 });
3384}
3385
3386# $mod and $sym are the modifiers and key symbol
3387# $cmds is a array ref of strings (the commands)
3388# $cb is the callback that is executed on OK
3389# $ccb is the callback that is executed on CANCEL and
3390# when the binding was unsuccessful on OK
3391sub set_binding {
3392 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3393
3394 $self->clear_command_list;
3395 $self->{recording} = 0;
3396 $self->{rec_btn}->set_text ("start recording");
3397
3398 $self->{binding} = [$mod, $sym];
3399 $self->{commands} = $cmds;
3400
3401 $self->{binding_change} = $cb;
3402 $self->{binding_cancel} = $ccb;
3403
3404 $self->update_binding_widgets;
3405}
3406
3407# this is a shortcut method that asks for a binding
3408# and then just binds it.
3409sub do_quick_binding {
3410 my ($self, $cmds) = @_;
3411 $self->set_binding (undef, undef, $cmds, sub {
3412 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413 });
3414 $self->ask_for_bind (1);
3415}
3416
3417sub update_binding_widgets {
3418 my ($self) = @_;
3419 my ($mod, $sym, $cmds) = $self->get_binding;
3420 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3421 $self->set_command_list ($cmds);
3422}
3423
3424sub get_binding {
3425 my ($self) = @_;
3426 return (
3427 $self->{binding}->[0],
3428 $self->{binding}->[1],
3429 [ grep { defined $_ } @{$self->{commands}} ]
3430 );
3431}
3432
3433sub clear_command_list {
3434 my ($self) = @_;
3435 $self->{cmdbox}->clear ();
3436}
3437
3438sub set_command_list {
3439 my ($self, $cmds) = @_;
3440
3441 $self->{cmdbox}->clear ();
3442 $self->{commands} = $cmds;
3443
3444 my $idx = 0;
3445
3446 for (@$cmds) {
3447 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3448
3449 my $i = $idx;
3450 $hb->add (new CFClient::UI::Label text => $_);
3451 $hb->add (new CFClient::UI::Button
3452 text => "delete",
3453 tooltip => "Deletes the action from the record",
3454 on_activate => sub {
3455 $self->{cmdbox}->remove ($hb);
3456 $cmds->[$i] = undef;
3457 });
3458
3459
3460 $idx++
3461 }
3462}
3463
3464#############################################################################
3465
3466package CFClient::UI::SpellList;
3467
3468our @ISA = CFClient::UI::Table::;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
3474 binding => [],
3475 commands => [],
3476 @_,
3477 )
3478}
3479
3480# XXX: Do sorting? Argl...
3481sub add_spell {
3482 my ($self, $spell) = @_;
3483 $self->{spells}->{$spell->{name}} = $spell;
3484
3485 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486 face => $spell->{face},
3487 can_hover => 1,
3488 can_events => 1,
3489 tooltip => $spell->{message});
3490
3491 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492 text => $spell->{name},
3493 can_hover => 1,
3494 can_events => 1,
3495 tooltip => $spell->{message},
3496 expand => 1);
3497
3498 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501 expand => 1);
3502
3503 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504 text => "bind to key",
3505 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506}
3507
3508sub rebuild_spell_list {
3509 my ($self) = @_;
3510 $self->{tbl_idx} = 0;
3511 $self->add_spell ($_) for values %{$self->{spells}};
3512}
3513
3514sub remove_spell {
3515 my ($self, $spell) = @_;
3516 delete $self->{spells}->{$spell->{name}};
3517 $self->rebuild_spell_list;
3518}
3519
3520#############################################################################
3521
3522package CFClient::UI::Root; 3831package CFPlus::UI::Root;
3523 3832
3524our @ISA = CFClient::UI::Container::; 3833our @ISA = CFPlus::UI::Container::;
3525 3834
3526use List::Util qw(min max); 3835use List::Util qw(min max);
3527 3836
3528use CFClient::OpenGL; 3837use CFPlus::OpenGL;
3529 3838
3530sub new { 3839sub new {
3531 my $class = shift; 3840 my $class = shift;
3532 3841
3533 my $self = $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3534 visible => 1, 3843 visible => 1,
3535 @_, 3844 @_,
3536 ); 3845 );
3537 3846
3538 Scalar::Util::weaken ($self->{root} = $self); 3847 CFPlus::weaken ($self->{root} = $self);
3539 3848
3540 $self 3849 $self
3541} 3850}
3542 3851
3543sub size_request { 3852sub size_request {
… …
3558 $coord = $max - $size if $coord > $max - $size; 3867 $coord = $max - $size if $coord > $max - $size;
3559 3868
3560 int $coord + 0.5 3869 int $coord + 0.5
3561} 3870}
3562 3871
3563sub size_allocate { 3872sub invoke_size_allocate {
3564 my ($self, $w, $h) = @_; 3873 my ($self, $w, $h) = @_;
3565 3874
3566 for my $child ($self->children) { 3875 for my $child ($self->children) {
3567 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3876 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3568 3877
… …
3572 $X = _to_pixel $X, $W, $self->{w}; 3881 $X = _to_pixel $X, $W, $self->{w};
3573 $Y = _to_pixel $Y, $H, $self->{h}; 3882 $Y = _to_pixel $Y, $H, $self->{h};
3574 3883
3575 $child->configure ($X, $Y, $W, $H); 3884 $child->configure ($X, $Y, $W, $H);
3576 } 3885 }
3886
3887 1
3577} 3888}
3578 3889
3579sub coord2local { 3890sub coord2local {
3580 my ($self, $x, $y) = @_; 3891 my ($self, $x, $y) = @_;
3581 3892
… …
3707 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4018 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3708 4019
3709 $w = 0 if $w < 0; 4020 $w = 0 if $w < 0;
3710 $h = 0 if $h < 0; 4021 $h = 0 if $h < 0;
3711 4022
4023 $w = max $widget->{min_w}, $w;
4024 $h = max $widget->{min_h}, $h;
4025
4026# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028
4029 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4031
3712 $w = int $w + 0.5; 4032 $w = int $w + 0.5;
3713 $h = int $h + 0.5; 4033 $h = int $h + 0.5;
3714 4034
3715 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4035 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3716 $widget->{old_w} = $widget->{w}; 4036 $widget->{old_w} = $widget->{w};
… …
3739 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3740 glMatrixMode GL_MODELVIEW; 4060 glMatrixMode GL_MODELVIEW;
3741 glLoadIdentity; 4061 glLoadIdentity;
3742 4062
3743 { 4063 {
3744 package CFClient::UI::Base; 4064 package CFPlus::UI::Base;
3745 4065
3746 ($draw_x, $draw_y, $draw_w, $draw_h) = 4066 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3747 (0, 0, $self->{w}, $self->{h}); 4067 (0, 0, $self->{w}, $self->{h});
3748 }
3749 4068
3750 $self->_draw; 4069 $self->_draw;
4070 }
3751} 4071}
3752 4072
3753############################################################################# 4073#############################################################################
3754 4074
3755package CFClient::UI; 4075package CFPlus::UI;
3756 4076
3757$ROOT = new CFClient::UI::Root; 4077$ROOT = new CFPlus::UI::Root;
3758$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4078$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3759 4079
37601 40801
3761 4081

Diff Legend

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