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.287 by root, Mon Jun 5 05:31:13 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 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 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
980 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
981 %arg, 1073 %arg,
982 ); 1074 );
983 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1082 $self->SUPER::add (0, 0, $self->{vp});
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
985 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
986 1087
987 $self 1088 $self
988} 1089}
1090
1091#TODO# update range on size_allocate depending on child
989 1092
990sub add { 1093sub add {
991 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
992 1095
993 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
994} 1097}
995 1098
1099sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_;
1101
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $self->{vslider}->emit (mouse_wheel => $ev);
1105
1106 1
1107}
1108
1109sub update_slider {
1110 my ($self) = @_;
1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1121}
1122
996sub update { 1123sub update {
997 my ($self) = @_; 1124 my ($self) = @_;
998 1125
999 $self->SUPER::update; 1126 $self->SUPER::update;
1000 1127 $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} 1128}
1005 1129
1006sub size_allocate { 1130sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
1008 1132
1133 $self->update_slider;
1009 $self->SUPER::size_allocate ($w, $h); 1134 $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} 1135}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1136
1018############################################################################# 1137#############################################################################
1019 1138
1020package CFClient::UI::Frame; 1139package CFPlus::UI::Frame;
1021 1140
1022our @ISA = CFClient::UI::Bin::; 1141our @ISA = CFPlus::UI::Bin::;
1023 1142
1024use CFClient::OpenGL; 1143use CFPlus::OpenGL;
1025 1144
1026sub new { 1145sub new {
1027 my $class = shift; 1146 my $class = shift;
1028 1147
1029 $class->SUPER::new ( 1148 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1174 $self->SUPER::_draw;
1056} 1175}
1057 1176
1058############################################################################# 1177#############################################################################
1059 1178
1060package CFClient::UI::FancyFrame; 1179package CFPlus::UI::FancyFrame;
1061 1180
1062our @ISA = CFClient::UI::Bin::; 1181our @ISA = CFPlus::UI::Bin::;
1063 1182
1064use CFClient::OpenGL; 1183use 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 1184
1074sub new { 1185sub new {
1075 my ($class, %arg) = @_; 1186 my ($class, %arg) = @_;
1076 1187
1077 my $title = delete $arg{title}; 1188 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label
1190 align => 1,
1191 valign => 0,
1192 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75;
1194 }
1195
1196 my $self = $class->SUPER::new (
1197 # label => "",
1198 fg => [0.6, 0.3, 0.1],
1199 border => 0.8,
1200 style => 'single',
1201 %arg,
1202 );
1203
1204 $self
1205}
1206
1207sub add {
1208 my ($self, @widgets) = @_;
1209
1210 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1212}
1213
1214sub border {
1215 int $_[0]{border} * $::FONTSIZE
1216}
1217
1218sub size_request {
1219 my ($self) = @_;
1220
1221 ($self->{label_w}, undef) = $self->{label}->size_request
1222 if $self->{label};
1223
1224 my ($w, $h) = $self->SUPER::size_request;
1225
1226 (
1227 $w + $self->border * 2,
1228 $h + $self->border * 2,
1229 )
1230}
1231
1232sub invoke_size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 my $border = $self->border;
1236
1237 $w -= List::Util::max 0, $border * 2;
1238 $h -= List::Util::max 0, $border * 2;
1239
1240 if (my $label = $self->{label}) {
1241 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1242 $label->{h} = List::Util::min $h, $border;
1243 $label->invoke_size_allocate ($label->{w}, $label->{h});
1244 }
1245
1246 $self->child->configure ($border, $border, $w, $h);
1247
1248 1
1249}
1250
1251sub _draw {
1252 my ($self) = @_;
1253
1254 my $child = $self->{children}[0];
1255
1256 my $border = $self->border;
1257 my ($w, $h) = ($self->{w}, $self->{h});
1258
1259 $child->draw;
1260
1261 glColor @{$self->{fg}};
1262 glBegin GL_LINE_STRIP;
1263 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1264 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1265 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1266 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1267 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1268 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1269 glEnd;
1270
1271 if ($self->{label}) {
1272 glTranslate $border * 2, 0;
1273 $self->{label}->_draw;
1274 }
1275}
1276
1277#############################################################################
1278
1279package CFPlus::UI::Toplevel;
1280
1281our @ISA = CFPlus::UI::Bin::;
1282
1283use CFPlus::OpenGL;
1284
1285my $bg =
1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1287 mipmap => 1, wrap => 1;
1288
1289my @border =
1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1292
1293sub new {
1294 my ($class, %arg) = @_;
1078 1295
1079 my $self = $class->SUPER::new ( 1296 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1297 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1298 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1299 border => 0.6,
1083 can_events => 1, 1300 can_events => 1,
1084 min_w => 16, 1301 min_w => 64,
1085 min_h => 16, 1302 min_h => 32,
1086 %arg, 1303 %arg,
1087 ); 1304 );
1088 1305
1089 $self->{title} = new CFClient::UI::Label 1306 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1307 align => 0,
1091 valign => 1, 1308 valign => 1,
1092 text => $title, 1309 text => $self->{title},
1093 fontsize => $self->{border} 1310 fontsize => $self->{border},
1094 if defined $title; 1311 if exists $self->{title};
1312
1313 if ($self->{has_close_button}) {
1314 $self->{close_button} =
1315 new CFPlus::UI::ImageButton
1316 path => 'x1_close.png',
1317 on_activate => sub { $self->emit ("delete") };
1318
1319 $self->CFPlus::UI::Container::add ($self->{close_button});
1320 }
1095 1321
1096 $self 1322 $self
1097} 1323}
1098 1324
1099sub add { 1325sub add {
1100 my ($self, @widgets) = @_; 1326 my ($self, @widgets) = @_;
1101 1327
1102 $self->SUPER::add (@widgets); 1328 $self->SUPER::add (@widgets);
1329 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1330 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1331}
1105 1332
1106sub border { 1333sub border {
1107 int $_[0]{border} * $::FONTSIZE 1334 int $_[0]{border} * $::FONTSIZE
1108} 1335}
1109 1336
1110sub size_request { 1337sub size_request {
1111 my ($self) = @_; 1338 my ($self) = @_;
1112 1339
1113 $self->{title}->size_request 1340 $self->{title_widget}->size_request
1114 if $self->{title}; 1341 if $self->{title_widget};
1342
1343 $self->{close_button}->size_request
1344 if $self->{close_button};
1115 1345
1116 my ($w, $h) = $self->SUPER::size_request; 1346 my ($w, $h) = $self->SUPER::size_request;
1117 1347
1118 ( 1348 (
1119 $w + $self->border * 2, 1349 $w + $self->border * 2,
1120 $h + $self->border * 2, 1350 $h + $self->border * 2,
1121 ) 1351 )
1122} 1352}
1123 1353
1124sub size_allocate { 1354sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1126 1356
1127 if ($self->{title}) { 1357 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1358 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1359 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1360 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1361 }
1132 1362
1133 my $border = $self->border; 1363 my $border = $self->border;
1134 1364
1135 $h -= List::Util::max 0, $border * 2; 1365 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1366 $w -= List::Util::max 0, $border * 2;
1367
1368 $self->child->configure ($border, $border, $w, $h);
1369
1370 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1371 if $self->{close_button};
1372
1373 1
1374}
1375
1376sub invoke_delete {
1377 my ($self) = @_;
1378
1379 $self->hide;
1137 1380
1138 $self->child->configure ($border, $border, $w, $h); 1381 1
1139} 1382}
1140 1383
1141sub button_down { 1384sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1385 my ($self, $ev, $x, $y) = @_;
1143 1386
1144 my ($w, $h) = @$self{qw(w h)}; 1387 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1388 my $border = $self->border;
1146 1389
… …
1177 1420
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1421 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1422
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1423 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1424 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1425 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1426 };
1184 } else { 1427 } else {
1185 return 0; 1428 return 0;
1186 } 1429 }
1187 1430
1188 1 1431 1
1189} 1432}
1190 1433
1191sub button_up { 1434sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1435 my ($self, $ev, $x, $y) = @_;
1193 1436
1194 !!delete $self->{motion} 1437 ! ! delete $self->{motion}
1195} 1438}
1196 1439
1197sub mouse_motion { 1440sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1441 my ($self, $ev, $x, $y) = @_;
1199 1442
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1444
1202 !!$self->{motion} 1445 ! ! $self->{motion}
1446}
1447
1448sub invoke_visibility_change {
1449 my ($self, $visible) = @_;
1450
1451 delete $self->{motion} unless $visible;
1452
1453 0
1203} 1454}
1204 1455
1205sub _draw { 1456sub _draw {
1206 my ($self) = @_; 1457 my ($self) = @_;
1207 1458
… …
1233 1484
1234 glDisable GL_TEXTURE_2D; 1485 glDisable GL_TEXTURE_2D;
1235 1486
1236 $child->draw; 1487 $child->draw;
1237 1488
1238 if ($self->{title}) { 1489 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1490 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1491 $self->{title_widget}->_draw;
1492
1493 glTranslate 0, - ($border - $self->{h});
1241 } 1494 }
1495
1496 $self->{close_button}->draw
1497 if $self->{close_button};
1242} 1498}
1243 1499
1244############################################################################# 1500#############################################################################
1245 1501
1246package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1247 1503
1248our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1249 1505
1250use List::Util qw(max sum); 1506use List::Util qw(max sum);
1251 1507
1252use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1253 1509
1254sub new { 1510sub new {
1255 my $class = shift; 1511 my $class = shift;
1256 1512
1257 $class->SUPER::new ( 1513 $class->SUPER::new (
1258 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1259 @_, 1516 @_,
1260 ) 1517 )
1261} 1518}
1262 1519
1263sub children { 1520sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1522}
1266 1523
1267sub add { 1524sub add {
1268 my ($self, $x, $y, $child) = @_; 1525 my ($self) = shift;
1269 1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1529 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1530 $self->{children}[$y][$x] = $child;
1531 }
1272 1532
1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1535 $self->realloc;
1536}
1537
1538sub remove {
1539 my ($self, $child) = @_;
1540
1541 # TODO: not yet implemented
1274} 1542}
1275 1543
1276# TODO: move to container class maybe? send children a signal on removal? 1544# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1545sub clear {
1278 my ($self) = @_; 1546 my ($self) = @_;
… …
1319 (sum @$ws), 1587 (sum @$ws),
1320 (sum @$hs), 1588 (sum @$hs),
1321 ) 1589 )
1322} 1590}
1323 1591
1324sub size_allocate { 1592sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1326 1594
1327 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1328 1596
1329 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1330 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1331 1599
1332 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1333 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1334 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1335 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1336 1604
1337 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1606
1341 CFClient::UI::harmonize $ws; 1607 CFPlus::UI::harmonize $ws;
1608
1609 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1;
1612
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614
1342 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1343 1616
1344 my $y; 1617 my $y;
1345 1618
1346 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1361 } 1634 }
1362 1635
1363 $y += $row_h; 1636 $y += $row_h;
1364 } 1637 }
1365 1638
1639 1
1366} 1640}
1367 1641
1368sub find_widget { 1642sub find_widget {
1369 my ($self, $x, $y) = @_; 1643 my ($self, $x, $y) = @_;
1370 1644
… …
1389 } 1663 }
1390} 1664}
1391 1665
1392############################################################################# 1666#############################################################################
1393 1667
1394package CFClient::UI::Box; 1668package CFPlus::UI::Box;
1395 1669
1396our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1397 1671
1398sub size_request { 1672sub size_request {
1399 my ($self) = @_; 1673 my ($self) = @_;
1400 1674
1401 $self->{vertical} 1675 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1681 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1682 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1683 )
1410} 1684}
1411 1685
1412sub size_allocate { 1686sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1687 my ($self, $w, $h) = @_;
1414 1688
1415 my $space = $self->{vertical} ? $h : $w; 1689 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1690 my @children = $self->visible_children;
1417 1691
1418 my @req; 1692 my @req;
1419 1693
1420 if ($self->{homogeneous}) { 1694 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1695 @req = ($space / (@children || 1)) x @children;
1422 } else { 1696 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1697 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1698 my $req = List::Util::sum @req;
1425 1699
1426 if ($req > $space) { 1700 if ($req > $space) {
1427 # ah well, not enough space 1701 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1702 $_ *= $space / $req for @req;
1429 } else { 1703 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1704 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1705
1432 $space = ($space - $req) / $expand; # remaining space to give away 1706 $space = ($space - $req) / $expand; # remaining space to give away
1433 1707
1434 $req[$_] += $space * $children->[$_]{expand} 1708 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1709 for 0 .. $#children;
1436 } 1710 }
1437 } 1711 }
1438 1712
1439 CFClient::UI::harmonize \@req; 1713 CFPlus::UI::harmonize \@req;
1440 1714
1441 my $pos = 0; 1715 my $pos = 0;
1442 for (0 .. $#$children) { 1716 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1717 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1718 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1719
1446 $pos += $alloc; 1720 $pos += $alloc;
1447 } 1721 }
1448 1722
1449 1 1723 1
1450} 1724}
1451 1725
1452############################################################################# 1726#############################################################################
1453 1727
1454package CFClient::UI::HBox; 1728package CFPlus::UI::HBox;
1455 1729
1456our @ISA = CFClient::UI::Box::; 1730our @ISA = CFPlus::UI::Box::;
1457 1731
1458sub new { 1732sub new {
1459 my $class = shift; 1733 my $class = shift;
1460 1734
1461 $class->SUPER::new ( 1735 $class->SUPER::new (
… …
1464 ) 1738 )
1465} 1739}
1466 1740
1467############################################################################# 1741#############################################################################
1468 1742
1469package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1470 1744
1471our @ISA = CFClient::UI::Box::; 1745our @ISA = CFPlus::UI::Box::;
1472 1746
1473sub new { 1747sub new {
1474 my $class = shift; 1748 my $class = shift;
1475 1749
1476 $class->SUPER::new ( 1750 $class->SUPER::new (
… …
1479 ) 1753 )
1480} 1754}
1481 1755
1482############################################################################# 1756#############################################################################
1483 1757
1484package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1485 1759
1486our @ISA = CFClient::UI::DrawBG::; 1760our @ISA = CFPlus::UI::DrawBG::;
1487 1761
1488use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1489 1763
1490sub new { 1764sub new {
1491 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1492 1766
1493 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1770 #active_bg => none
1497 #font => default_font 1771 #font => default_font
1498 #text => initial text 1772 #text => initial text
1499 #markup => initial narkup 1773 #markup => initial narkup
1500 #max_w => maximum pixel width 1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1501 ellipsise => 3, # end 1776 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1777 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1778 fontsize => 1,
1504 align => -1, 1779 align => -1,
1505 valign => -1, 1780 valign => -1,
1506 padding_x => 2, 1781 padding_x => 2,
1507 padding_y => 2, 1782 padding_y => 2,
1508 can_events => 0, 1783 can_events => 0,
1509 %arg 1784 %arg
1510 ); 1785 );
1511 1786
1512 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1788 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1790 $self->{template} = $layout;
1516 } 1791 }
1517 1792
1518 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1522 } 1797 }
1523 1798
1524 $self 1799 $self
1525} 1800}
1526 1801
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1802sub update {
1538 my ($self) = @_; 1803 my ($self) = @_;
1539 1804
1540 delete $self->{texture}; 1805 delete $self->{texture};
1541 $self->SUPER::update; 1806 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1817 my ($self, $text) = @_;
1553 1818
1554 return if $self->{text} eq "T$text"; 1819 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1820 $self->{text} = "T$text";
1556 1821
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1822 $self->{layout}->set_text ($text);
1823
1559 delete $self->{req_h}; 1824 delete $self->{size_req};
1560
1561 $self->realloc; 1825 $self->realloc;
1562 $self->update; 1826 $self->update;
1563} 1827}
1564 1828
1565sub set_markup { 1829sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 1832 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1833 $self->{text} = "M$markup";
1570 1834
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1835 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1836
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1837 $self->{layout}->set_markup ($markup);
1838
1575 delete $self->{req_h}; 1839 delete $self->{size_req};
1576
1577 $self->realloc; 1840 $self->realloc;
1578 $self->update; 1841 $self->update;
1579} 1842}
1580 1843
1581sub size_request { 1844sub size_request {
1582 my ($self) = @_; 1845 my ($self) = @_;
1583 1846
1584 if (exists $self->{req_h}) { 1847 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1848 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1849 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1850 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1851 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1853
1593 my ($w, $h) = $self->{layout}->size; 1854 my ($w, $h) = $self->{layout}->size;
1594 1855
1595 if (exists $self->{template}) { 1856 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font}; 1857 $self->{template}->set_font ($self->{font}) if $self->{font};
1858 $self->{template}->set_width ($self->{max_w} || -1);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1859 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1860
1599 my ($w2, $h2) = $self->{template}->size; 1861 my ($w2, $h2) = $self->{template}->size;
1600 1862
1601 $w = List::Util::max $w, $w2; 1863 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1864 $h = List::Util::max $h, $h2;
1603 } 1865 }
1604 1866
1605 ($w, $h) 1867 [$w, $h]
1606 } 1868 };
1607}
1608 1869
1870 @{ $self->{size_req} }
1871}
1872
1873sub baseline_shift {
1874 $_[0]{layout}->descent
1875}
1876
1609sub size_allocate { 1877sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1878 my ($self, $w, $h) = @_;
1611 1879
1612 delete $self->{ox}; 1880 delete $self->{ox};
1613 1881
1614 delete $self->{texture} 1882 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1883 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1884
1885 1
1616} 1886}
1617 1887
1618sub set_fontsize { 1888sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1889 my ($self, $fontsize) = @_;
1620 1890
1621 $self->{fontsize} = $fontsize; 1891 $self->{fontsize} = $fontsize;
1892 delete $self->{size_req};
1622 delete $self->{texture}; 1893 delete $self->{texture};
1623 1894
1624 $self->realloc; 1895 $self->realloc;
1625} 1896}
1626 1897
1898sub reconfigure {
1899 my ($self) = @_;
1900
1901 delete $self->{size_req};
1902 delete $self->{texture};
1903
1904 $self->SUPER::reconfigure;
1905}
1906
1627sub _draw { 1907sub _draw {
1628 my ($self) = @_; 1908 my ($self) = @_;
1629 1909
1630 $self->SUPER::_draw; # draw background, if applicable 1910 $self->SUPER::_draw; # draw background, if applicable
1631 1911
1632 my $tex = $self->{texture} ||= do { 1912 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 1913 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1914 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 1915 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1916 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1917 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1918 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 1919
1640 new_from_layout CFClient::Texture $self->{layout} 1920 [$self->{layout}->size]
1641 }; 1921 };
1642 1922
1643 unless (exists $self->{ox}) { 1923 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1924 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1925 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 1926 : ($self->{w} - $size->[0]) * 0.5);
1647 1927
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1928 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1929 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 1930 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 1931 };
1652 1932
1653 glEnable GL_TEXTURE_2D; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1654 1935
1655 if ($tex->{format} == GL_ALPHA) { 1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1657 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659 } else {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1661 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1662 }
1663
1664 glDisable GL_TEXTURE_2D;
1665} 1937}
1666 1938
1667############################################################################# 1939#############################################################################
1668 1940
1669package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1670 1942
1671our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1672 1944
1673use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1674 1946
1675sub new { 1947sub new {
1676 my $class = shift; 1948 my $class = shift;
1677 1949
1678 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1682 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1683 can_hover => 1, 1955 can_hover => 1,
1684 can_focus => 1, 1956 can_focus => 1,
1685 valign => 0, 1957 valign => 0,
1686 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1687 #text => ... 1960 #text => ...
1961 #hidden => "*",
1688 @_ 1962 @_
1689 ) 1963 )
1690} 1964}
1691 1965
1692sub _set_text { 1966sub _set_text {
… …
1699 $self->{last_activity} = $::NOW; 1973 $self->{last_activity} = $::NOW;
1700 $self->{text} = $text; 1974 $self->{text} = $text;
1701 1975
1702 $text =~ s/./*/g if $self->{hidden}; 1976 $text =~ s/./*/g if $self->{hidden};
1703 $self->{layout}->set_text ("$text "); 1977 $self->{layout}->set_text ("$text ");
1704 delete $self->{req_h}; 1978 delete $self->{size_req};
1705 1979
1706 $self->_emit (changed => $self->{text}); 1980 $self->emit (changed => $self->{text});
1707 1981
1708 $self->realloc; 1982 $self->realloc;
1709 $self->update; 1983 $self->update;
1710} 1984}
1711 1985
… …
1726 my ($w, $h) = $self->SUPER::size_request; 2000 my ($w, $h) = $self->SUPER::size_request;
1727 2001
1728 ($w + 1, $h) # add 1 for cursor 2002 ($w + 1, $h) # add 1 for cursor
1729} 2003}
1730 2004
1731sub key_down { 2005sub invoke_key_down {
1732 my ($self, $ev) = @_; 2006 my ($self, $ev) = @_;
1733 2007
1734 my $mod = $ev->{mod}; 2008 my $mod = $ev->{mod};
1735 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1736 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1737 2011
1738 my $text = $self->get_text; 2012 my $text = $self->get_text;
2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1739 2015
1740 if ($uni == 8) { 2016 if ($uni == 8) {
1741 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1742 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1743 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1744 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1745 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1746 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1747 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1748 } elsif ($sym == CFClient::SDLK_HOME) { 2024 } elsif ($sym == CFPlus::SDLK_HOME) {
2025 # what a hack
2026 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1
2029 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) {
2031 # uh, again
2032 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1
2035 : length $self->{text};
2036 } elsif ($uni == 21) { # ctrl-u
2037 $text = "";
1749 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1750 } elsif ($sym == CFClient::SDLK_END) {
1751 $self->{cursor} = length $text;
1752 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1753 $self->_emit ('escape'); 2040 $self->emit ('escape');
1754 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1755 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
1756 } else { 2045 } else {
1757 return 0; 2046 return 0;
1758 } 2047 }
1759 2048
1760 $self->_set_text ($text); 2049 $self->_set_text ($text);
1761 2050
1762 $self->realloc; 2051 $self->realloc;
2052 $self->update;
1763 2053
1764 1 2054 1
1765} 2055}
1766 2056
1767sub focus_in { 2057sub invoke_focus_in {
1768 my ($self) = @_; 2058 my ($self) = @_;
1769 2059
1770 $self->{last_activity} = $::NOW; 2060 $self->{last_activity} = $::NOW;
1771 2061
1772 $self->SUPER::focus_in; 2062 $self->SUPER::invoke_focus_in
1773} 2063}
1774 2064
1775sub button_down { 2065sub invoke_button_down {
1776 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1777 2067
1778 $self->SUPER::button_down ($ev, $x, $y); 2068 $self->SUPER::invoke_button_down ($ev, $x, $y);
1779 2069
1780 my $idx = $self->{layout}->xy_to_index ($x, $y); 2070 my $idx = $self->{layout}->xy_to_index ($x, $y);
1781 2071
1782 # byte-index to char-index 2072 # byte-index to char-index
1783 my $text = $self->{text}; 2073 my $text = $self->{text};
1784 utf8::encode $text; 2074 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1785 $self->{cursor} = length substr $text, 0, $idx; 2075 $self->{cursor} = length $text;
1786 2076
1787 $self->_set_text ($self->{text}); 2077 $self->_set_text ($self->{text});
1788 $self->update; 2078 $self->update;
1789 2079
1790 1 2080 1
1791} 2081}
1792 2082
1793sub mouse_motion { 2083sub invoke_mouse_motion {
1794 my ($self, $ev, $x, $y) = @_; 2084 my ($self, $ev, $x, $y) = @_;
1795# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2085# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1796 2086
1797 0 2087 1
1798} 2088}
1799 2089
1800sub _draw { 2090sub _draw {
1801 my ($self) = @_; 2091 my ($self) = @_;
1802 2092
… …
1829 utf8::encode $text; 2119 utf8::encode $text;
1830 2120
1831 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1832 } 2122 }
1833 2123
1834 glColor @{$self->{fg}};
1835 glBegin GL_LINES; 2124 glBegin GL_LINES;
1836 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2125 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1837 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1838 glEnd; 2127 glEnd;
1839 } 2128 }
1840} 2129}
1841 2130
2131#############################################################################
2132
1842package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1843 2134
1844our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1845 2136
1846use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1847 2138
1848sub key_down { 2139sub invoke_key_down {
1849 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1850 2141
1851 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1852 2143
1853 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1854 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1855 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
2147
1856 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1857 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1858 $self->_emit (activate => $txt); 2150 $self->emit (activate => $txt);
1859 $self->update; 2151 $self->update;
1860 2152
1861 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1862 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1863 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1864 } 2156 }
1865 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1866 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1868 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1869 } 2161 }
1870 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1871 } 2163 }
1872 2164
1873 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1874 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1875 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1876 2168
1877 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1878 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1879 } else { 2171 } else {
1880 $self->set_text ($self->{history_saveback}); 2172 $self->set_text ($self->{history_saveback});
1881 } 2173 }
1882 2174
1883 } else { 2175 } else {
1884 return $self->SUPER::key_down ($ev) 2176 return $self->SUPER::invoke_key_down ($ev)
1885 } 2177 }
1886 2178
1887 1 2179 1
1888} 2180}
1889 2181
1890############################################################################# 2182#############################################################################
1891 2183
2184package CFPlus::UI::TextEdit;
2185
2186our @ISA = CFPlus::UI::EntryBase::;
2187
2188use CFPlus::OpenGL;
2189
2190sub move_cursor_ver {
2191 my ($self, $dy) = @_;
2192
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194
2195 $y += $dy;
2196
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2198 $self->{cursor} = $index;
2199 delete $self->{cur_h};
2200 $self->update;
2201 return;
2202 }
2203}
2204
2205sub invoke_key_down {
2206 my ($self, $ev) = @_;
2207
2208 my $sym = $ev->{sym};
2209
2210 if ($sym == CFPlus::SDLK_UP) {
2211 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1);
2214 } else {
2215 return $self->SUPER::invoke_key_down ($ev)
2216 }
2217
2218 1
2219}
2220
2221#############################################################################
2222
1892package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1893 2224
1894our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1895 2226
1896use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1897 2228
1898my @tex = 2229my @tex =
1899 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1900 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
1901 2232
1902sub new { 2233sub new {
1903 my $class = shift; 2234 my $class = shift;
1904 2235
… …
1913 can_events => 1, 2244 can_events => 1,
1914 @_ 2245 @_
1915 ) 2246 )
1916} 2247}
1917 2248
1918sub activate { }
1919
1920sub button_up { 2249sub invoke_button_up {
1921 my ($self, $ev, $x, $y) = @_; 2250 my ($self, $ev, $x, $y) = @_;
1922 2251
1923 $self->emit ("activate") 2252 $self->emit ("activate")
1924 if $x >= 0 && $x < $self->{w} 2253 if $x >= 0 && $x < $self->{w}
1925 && $y >= 0 && $y < $self->{h}; 2254 && $y >= 0 && $y < $self->{h};
… …
1943 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
1944} 2273}
1945 2274
1946############################################################################# 2275#############################################################################
1947 2276
1948package CFClient::UI::CheckBox; 2277package CFPlus::UI::CheckBox;
1949 2278
1950our @ISA = CFClient::UI::DrawBG::; 2279our @ISA = CFPlus::UI::DrawBG::;
1951 2280
1952my @tex = 2281my @tex =
1953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1954 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2283 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1955 2284
1956use CFClient::OpenGL; 2285use CFPlus::OpenGL;
1957 2286
1958sub new { 2287sub new {
1959 my $class = shift; 2288 my $class = shift;
1960 2289
1961 $class->SUPER::new ( 2290 $class->SUPER::new (
… …
1975 my ($self) = @_; 2304 my ($self) = @_;
1976 2305
1977 (6) x 2 2306 (6) x 2
1978} 2307}
1979 2308
2309sub toggle {
2310 my ($self) = @_;
2311
2312 $self->{state} = !$self->{state};
2313 $self->emit (changed => $self->{state});
2314 $self->update;
2315}
2316
1980sub button_down { 2317sub invoke_button_down {
1981 my ($self, $ev, $x, $y) = @_; 2318 my ($self, $ev, $x, $y) = @_;
1982 2319
1983 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2320 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1984 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2321 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1985 $self->{state} = !$self->{state}; 2322 $self->toggle;
1986 $self->_emit (changed => $self->{state});
1987 } else { 2323 } else {
1988 return 0 2324 return 0
1989 } 2325 }
1990 2326
1991 1 2327 1
… …
2011 glDisable GL_TEXTURE_2D; 2347 glDisable GL_TEXTURE_2D;
2012} 2348}
2013 2349
2014############################################################################# 2350#############################################################################
2015 2351
2016package CFClient::UI::Image; 2352package CFPlus::UI::Image;
2017 2353
2018our @ISA = CFClient::UI::Base::; 2354our @ISA = CFPlus::UI::Base::;
2019 2355
2020use CFClient::OpenGL; 2356use CFPlus::OpenGL;
2021use Carp qw/confess/;
2022 2357
2023our %loaded_images; 2358our %texture_cache;
2024 2359
2025sub new { 2360sub new {
2026 my $class = shift; 2361 my $class = shift;
2027 2362
2028 my $self = $class->SUPER::new (can_events => 0, @_); 2363 my $self = $class->SUPER::new (
2364 can_events => 0,
2365 @_,
2366 );
2029 2367
2030 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2368 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required";
2031 2370
2032 $loaded_images{$self->{image}} ||= 2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2033 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2034 2373
2035 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2374 CFPlus::weaken $texture_cache{$self->{path}};
2036 2375
2037 Scalar::Util::weaken $loaded_images{$self->{image}}; 2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2038
2039 $self->{aspect} = $tex->{w} / $tex->{h};
2040 2377
2041 $self 2378 $self
2042} 2379}
2043 2380
2381sub STORABLE_freeze {
2382 my ($self, $cloning) = @_;
2383
2384 $self->{path}
2385 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2386
2387 $self->{path}
2388}
2389
2390sub STORABLE_attach {
2391 my ($self, $cloning, $path) = @_;
2392
2393 $self->new (path => $path)
2394}
2395
2044sub size_request { 2396sub size_request {
2045 my ($self) = @_; 2397 my ($self) = @_;
2046 2398
2047 ($self->{tex}->{w}, $self->{tex}->{h}) 2399 ($self->{tex}{w}, $self->{tex}{h})
2048} 2400}
2049 2401
2050sub _draw { 2402sub _draw {
2051 my ($self) = @_; 2403 my ($self) = @_;
2052 2404
… …
2062 } 2414 }
2063 2415
2064 glEnable GL_TEXTURE_2D; 2416 glEnable GL_TEXTURE_2D;
2065 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2066 2418
2067 $tex->draw_quad_alpha (0, 0, $w, $h); 2419 $tex->draw_quad (0, 0, $w, $h);
2068 2420
2069 glDisable GL_TEXTURE_2D; 2421 glDisable GL_TEXTURE_2D;
2070} 2422}
2071 2423
2072############################################################################# 2424#############################################################################
2073 2425
2426package CFPlus::UI::ImageButton;
2427
2428our @ISA = CFPlus::UI::Image::;
2429
2430use CFPlus::OpenGL;
2431
2432my %textures;
2433
2434sub new {
2435 my $class = shift;
2436
2437 my $self = $class->SUPER::new (
2438 padding_x => 4,
2439 padding_y => 4,
2440 fg => [1, 1, 1],
2441 active_fg => [0, 0, 1],
2442 can_hover => 1,
2443 align => 0,
2444 valign => 0,
2445 can_events => 1,
2446 @_
2447 );
2448}
2449
2450sub invoke_button_up {
2451 my ($self, $ev, $x, $y) = @_;
2452
2453 $self->emit ("activate")
2454 if $x >= 0 && $x < $self->{w}
2455 && $y >= 0 && $y < $self->{h};
2456
2457 1
2458}
2459
2460#############################################################################
2461
2074package CFClient::UI::VGauge; 2462package CFPlus::UI::VGauge;
2075 2463
2076our @ISA = CFClient::UI::Base::; 2464our @ISA = CFPlus::UI::Base::;
2077 2465
2078use List::Util qw(min max); 2466use List::Util qw(min max);
2079 2467
2080use CFClient::OpenGL; 2468use CFPlus::OpenGL;
2081 2469
2082my %tex = ( 2470my %tex = (
2083 food => [ 2471 food => [
2084 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2085 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2086 ], 2474 ],
2087 grace => [ 2475 grace => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2090 ], 2478 ],
2091 hp => [ 2479 hp => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2093 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2094 ], 2482 ],
2095 mana => [ 2483 mana => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2098 ], 2486 ],
2099); 2487);
2100 2488
2101# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2161 my $ycut1 = max 0, min 1, $ycut; 2549 my $ycut1 = max 0, min 1, $ycut;
2162 my $ycut2 = max 0, min 1, $ycut - 1; 2550 my $ycut2 = max 0, min 1, $ycut - 1;
2163 2551
2164 my $h1 = $self->{h} * (1 - $ycut1); 2552 my $h1 = $self->{h} * (1 - $ycut1);
2165 my $h2 = $self->{h} * (1 - $ycut2); 2553 my $h2 = $self->{h} * (1 - $ycut2);
2554 my $h3 = $self->{h};
2555
2556 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2166 2557
2167 glEnable GL_BLEND; 2558 glEnable GL_BLEND;
2168 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2559 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2169 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2560 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2170 glEnable GL_TEXTURE_2D; 2561 glEnable GL_TEXTURE_2D;
… …
2189 2580
2190 if ($t3) { 2581 if ($t3) {
2191 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2582 glBindTexture GL_TEXTURE_2D, $t3->{name};
2192 glBegin GL_QUADS; 2583 glBegin GL_QUADS;
2193 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2584 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2194 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2585 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2195 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2586 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2196 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2587 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2197 glEnd; 2588 glEnd;
2198 } 2589 }
2199 2590
2200 glDisable GL_BLEND; 2591 glDisable GL_BLEND;
2201 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2202} 2593}
2203 2594
2204############################################################################# 2595#############################################################################
2205 2596
2206package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
2207 2598
2208our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
2209 2600
2210sub new { 2601sub new {
2211 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
2212 2603
2213 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
2215 can_hover => 1, 2606 can_hover => 1,
2216 can_events => 1, 2607 can_events => 1,
2217 %arg, 2608 %arg,
2218 ); 2609 );
2219 2610
2220 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2611 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2221 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2612 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2222 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2613 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2223 2614
2224 $self 2615 $self
2225} 2616}
2226 2617
2227sub set_fontsize { 2618sub set_fontsize {
… …
2248 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
2249} 2640}
2250 2641
2251############################################################################# 2642#############################################################################
2252 2643
2253package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2254 2645
2255use strict; 2646use strict;
2256 2647
2257use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2258 2649
2259our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2260 2651
2261my @tex = 2652my @tex =
2262 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2263 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2264 2655
2265sub new { 2656sub new {
2266 my $class = shift; 2657 my $class = shift;
2267 2658
… …
2288 $self->update; 2679 $self->update;
2289 2680
2290 $self 2681 $self
2291} 2682}
2292 2683
2293sub changed { }
2294
2295sub set_range { 2684sub set_range {
2296 my ($self, $range) = @_; 2685 my ($self, $range) = @_;
2297 2686
2298 ($range, $self->{range}) = ($self->{range}, $range); 2687 ($range, $self->{range}) = ($self->{range}, $range);
2299 2688
2300 $self->update
2301 if "@$range" ne "@{$self->{range}}"; 2689 if ("@$range" ne "@{$self->{range}}") {
2690 $self->update;
2691 $self->set_value ($self->{range}[0]);
2692 }
2302} 2693}
2303 2694
2304sub set_value { 2695sub set_value {
2305 my ($self, $value) = @_; 2696 my ($self, $value) = @_;
2306 2697
… …
2317 if $unit; 2708 if $unit;
2318 2709
2319 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2710 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2320 2711
2321 if ($value != $old_value) { 2712 if ($value != $old_value) {
2322 $self->_emit (changed => $value); 2713 $self->emit (changed => $value);
2323 $self->update; 2714 $self->update;
2324 } 2715 }
2325} 2716}
2326 2717
2327sub size_request { 2718sub size_request {
2328 my ($self) = @_; 2719 my ($self) = @_;
2329 2720
2330 ($self->{req_w}, $self->{req_h}) 2721 ($self->{req_w}, $self->{req_h})
2331} 2722}
2332 2723
2333sub button_down { 2724sub invoke_button_down {
2334 my ($self, $ev, $x, $y) = @_; 2725 my ($self, $ev, $x, $y) = @_;
2335 2726
2336 $self->SUPER::button_down ($ev, $x, $y); 2727 $self->SUPER::invoke_button_down ($ev, $x, $y);
2337 2728
2338 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2729 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2339 2730
2340 $self->mouse_motion ($ev, $x, $y) 2731 $self->invoke_mouse_motion ($ev, $x, $y)
2341} 2732}
2342 2733
2343sub mouse_motion { 2734sub invoke_mouse_motion {
2344 my ($self, $ev, $x, $y) = @_; 2735 my ($self, $ev, $x, $y) = @_;
2345 2736
2346 if ($GRAB == $self) { 2737 if ($GRAB == $self) {
2347 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2738 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2348 2739
… …
2354 } else { 2745 } else {
2355 return 0; 2746 return 0;
2356 } 2747 }
2357 2748
2358 1 2749 1
2750}
2751
2752sub invoke_mouse_wheel {
2753 my ($self, $ev) = @_;
2754
2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2760
2761 ! ! $delta
2359} 2762}
2360 2763
2361sub update { 2764sub update {
2362 my ($self) = @_; 2765 my ($self) = @_;
2363 2766
… …
2412 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2413} 2816}
2414 2817
2415############################################################################# 2818#############################################################################
2416 2819
2417package CFClient::UI::ValSlider; 2820package CFPlus::UI::ValSlider;
2418 2821
2419our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2420 2823
2421sub new { 2824sub new {
2422 my ($class, %arg) = @_; 2825 my ($class, %arg) = @_;
2423 2826
2424 my $range = delete $arg{range}; 2827 my $range = delete $arg{range};
2425 2828
2426 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2427 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2428 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2429 to_value => sub { shift }, 2832 to_value => sub { shift },
2430 from_value => sub { shift }, 2833 from_value => sub { shift },
2431 %arg, 2834 %arg,
2432 ); 2835 );
2433 2836
… …
2453sub set_range { shift->{slider}->set_range (@_) } 2856sub set_range { shift->{slider}->set_range (@_) }
2454sub set_value { shift->{slider}->set_value (@_) } 2857sub set_value { shift->{slider}->set_value (@_) }
2455 2858
2456############################################################################# 2859#############################################################################
2457 2860
2458package CFClient::UI::TextView; 2861package CFPlus::UI::TextScroller;
2459 2862
2460our @ISA = CFClient::UI::HBox::; 2863our @ISA = CFPlus::UI::HBox::;
2461 2864
2462use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2463 2866
2464sub new { 2867sub new {
2465 my $class = shift; 2868 my $class = shift;
2466 2869
2467 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
2468 fontsize => 1, 2871 fontsize => 1,
2469 can_events => 0, 2872 can_events => 1,
2873 indent => 0,
2470 #font => default_font 2874 #font => default_font
2471 @_, 2875 @_,
2472 2876
2473 layout => (new CFClient::Layout 1), 2877 layout => (new CFPlus::Layout),
2474 par => [], 2878 par => [],
2879 max_par => 0,
2475 height => 0, 2880 height => 0,
2476 children => [ 2881 children => [
2477 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2478 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2479 ], 2884 ],
2480 ); 2885 );
2481 2886
2482 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2483 2888
… …
2489 2894
2490 $self->{fontsize} = $fontsize; 2895 $self->{fontsize} = $fontsize;
2491 $self->reflow; 2896 $self->reflow;
2492} 2897}
2493 2898
2899sub size_request {
2900 my ($self) = @_;
2901
2902 my ($empty, $slider) = @{ $self->{children} };
2903
2904 local $self->{children} = [$empty, $slider];
2905 $self->SUPER::size_request
2906}
2907
2494sub size_allocate { 2908sub invoke_size_allocate {
2495 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2496 2910
2497 $self->SUPER::size_allocate ($w, $h); 2911 my ($empty, $slider, @other) = @{ $self->{children} };
2912 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2498 2913
2499 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2914 $self->{layout}->set_font ($self->{font}) if $self->{font};
2500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2915 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $self->{layout}->set_width ($self->{children}[0]{w}); 2916 $self->{layout}->set_width ($empty->{w});
2917 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 2918
2503 $self->reflow; 2919 $self->reflow;
2504}
2505 2920
2506sub text_size { 2921 local $self->{children} = [$empty, $slider];
2922 $self->SUPER::invoke_size_allocate ($w, $h)
2923}
2924
2925sub invoke_mouse_wheel {
2507 my ($self, $text, $indent) = @_; 2926 my ($self, $ev) = @_;
2927
2928 return 0 unless $ev->{dy}; # only vertical movements
2929
2930 $self->{children}[1]->emit (mouse_wheel => $ev);
2931
2932 1
2933}
2934
2935sub get_layout {
2936 my ($self, $para) = @_;
2508 2937
2509 my $layout = $self->{layout}; 2938 my $layout = $self->{layout};
2510 2939
2940 $layout->set_font ($self->{font}) if $self->{font};
2941 $layout->set_foreground (@{$para->{fg}});
2511 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2942 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2512 $layout->set_width ($self->{children}[0]{w} - $indent); 2943 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2944 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2513 $layout->set_markup ($text); 2945 $layout->set_markup ($para->{markup});
2946
2947 $layout->set_shapes (
2948 map
2949 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2950 @{$para->{widget}}
2514 2951 );
2952
2515 $layout->size 2953 $layout
2516} 2954}
2517 2955
2518sub reflow { 2956sub reflow {
2519 my ($self) = @_; 2957 my ($self) = @_;
2520 2958
… …
2527 2965
2528 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2529 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2530} 2968}
2531 2969
2970sub current_paragraph {
2971 my ($self) = @_;
2972
2973 $self->{top_paragraph} - 1
2974}
2975
2976sub scroll_to {
2977 my ($self, $para) = @_;
2978
2979 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2980
2981 $self->{scroll_to} = $para;
2982 $self->update;
2983}
2984
2532sub clear { 2985sub clear {
2533 my ($self) = @_; 2986 my ($self) = @_;
2987
2988 my (undef, undef, @other) = @{ $self->{children} };
2989 $self->remove ($_) for @other;
2534 2990
2535 $self->{par} = []; 2991 $self->{par} = [];
2536 $self->{height} = 0; 2992 $self->{height} = 0;
2537 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2538} 2994}
2539 2995
2540sub add_paragraph { 2996sub add_paragraph {
2541 my ($self, $color, $text, $indent) = @_; 2997 my $self = shift;
2542 2998
2543 for my $line (split /\n/, $text) { 2999 for my $para (@_) {
2544 my ($w, $h) = $self->text_size ($line); 3000 $para = {
3001 fg => [1, 1, 1, 1],
3002 indent => 0,
3003 markup => "",
3004 widget => [],
3005 ref $para ? %$para : (markup => $para),
3006 w => 1e10,
3007 wrapped => 1,
3008 };
3009
3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3011 push @{$self->{par}}, $para;
3012 }
3013
3014 if (my $max = $self->{max_par}) {
3015 shift @{$self->{par}} while @{$self->{par}} > $max;
3016 }
3017
3018 $self->{need_reflow}++;
3019 $self->update;
3020}
3021
3022sub scroll_to_bottom {
3023 my ($self) = @_;
3024
3025 $self->{scroll_to} = $#{$self->{par}};
3026 $self->update;
3027}
3028
3029sub force_uptodate {
3030 my ($self) = @_;
3031
3032 if (delete $self->{need_reflow}) {
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034
3035 my $height = 0;
3036
3037 for my $para (@{$self->{par}}) {
3038 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3039 my $layout = $self->get_layout ($para);
3040 my ($w, $h) = $layout->size;
3041
3042 $para->{w} = $w + $para->{indent};
3043 $para->{h} = $h;
3044 $para->{wrapped} = $layout->has_wrapped;
3045 }
3046
3047 $para->{y} = $height;
3048 $height += $para->{h};
3049 }
3050
2545 $self->{height} += $h; 3051 $self->{height} = $height;
2546 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2547 }
2548 3053
2549 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3054 delete $self->{texture};
3055 }
3056
3057 if (my $paridx = delete $self->{scroll_to}) {
3058 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3059 }
2550} 3060}
2551 3061
2552sub update { 3062sub update {
2553 my ($self) = @_; 3063 my ($self) = @_;
2554 3064
… …
2556 3066
2557 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2558 3068
2559 delete $self->{texture}; 3069 delete $self->{texture};
2560 3070
2561 $ROOT->on_post_alloc ($self, sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2562 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2563 3075
2564 if (delete $self->{need_reflow}) {
2565 my $height = 0;
2566
2567 my $layout = $self->{layout};
2568
2569 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2570
2571 for (@{$self->{par}}) {
2572 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2573 $layout->set_width ($W - $_->[3]);
2574 $layout->set_markup ($_->[4]);
2575 my ($w, $h) = $layout->size;
2576 $_->[0] = $w + $_->[3];
2577 $_->[1] = $h;
2578 }
2579
2580 $height += $_->[1];
2581 }
2582
2583 $self->{height} = $height;
2584
2585 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2586
2587 delete $self->{texture};
2588 }
2589
2590 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2591 glClearColor 0, 0, 0, 0; 3077 glClearColor 0, 0, 0, 0;
2592 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2593 3079
3080 package CFPlus::UI::Base;
3081 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h});
3083
3084 my $top = int $self->{children}[1]{range}[0];
3085
3086 my $paridx = 0;
3087 my $top_paragraph;
2594 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2595 3089
2596 my $y0 = $top; 3090 my $y0 = $top;
2597 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2598 3092
2599 my $y = 0;
2600
2601 my $layout = $self->{layout};
2602
2603 $layout->set_font ($self->{font}) if $self->{font};
2604
2605 glEnable GL_BLEND;
2606 #TODO# not correct in windows where rgba is forced off
2607 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2608
2609 for my $par (@{$self->{par}}) { 3093 for my $para (@{$self->{par}}) {
2610 my $h = $par->[1]; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2611 3096
2612 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2613 $layout->set_foreground (@{ $par->[2] }); 3098 my $layout = $self->get_layout ($para);
2614 $layout->set_width ($W - $par->[3]);
2615 $layout->set_markup ($par->[4]);
2616 3099
2617 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3100 $layout->render ($para->{indent}, $y - $y0);
2618 3101
2619 glRasterPos $par->[3], $y - $y0; 3102 if (my @w = @{ $para->{widget} }) {
2620 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3103 my @s = $layout->get_shapes;
3104
3105 for (@w) {
3106 my ($dx, $dy) = splice @s, 0, 2, ();
3107
3108 $_->{x} = $dx + $para->{indent};
3109 $_->{y} = $dy + $y - $y0;
3110
3111 $_->draw;
3112 }
3113 }
2621 } 3114 }
2622 3115
2623 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2624 } 3118 }
2625 3119
2626 glDisable GL_BLEND; 3120 $self->{top_paragraph} = $top_paragraph;
2627 }; 3121 };
2628 }); 3122 });
3123}
3124
3125sub reconfigure {
3126 my ($self) = @_;
3127
3128 $self->SUPER::reconfigure;
3129
3130 $_->{w} = 1e10 for @{ $self->{par} };
3131 $self->reflow;
2629} 3132}
2630 3133
2631sub _draw { 3134sub _draw {
2632 my ($self) = @_; 3135 my ($self) = @_;
2633 3136
… …
2636 glColor 0, 0, 0, 1; 3139 glColor 0, 0, 0, 1;
2637 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3140 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2638 glDisable GL_TEXTURE_2D; 3141 glDisable GL_TEXTURE_2D;
2639 3142
2640 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2641
2642} 3144}
2643 3145
2644############################################################################# 3146#############################################################################
2645 3147
2646package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2647 3149
2648use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2649 3151
2650our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2651 3153
2652sub moveto { 3154sub moveto {
2653 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2654 3156
2655 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2683 glPopMatrix; 3185 glPopMatrix;
2684} 3186}
2685 3187
2686############################################################################# 3188#############################################################################
2687 3189
2688package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2689 3191
2690our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2691 3193
2692sub new { 3194sub new {
2693 my $class = shift; 3195 my $class = shift;
2694 3196
2695 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
… …
2707 $self->{other}->toggle_visibility; 3209 $self->{other}->toggle_visibility;
2708} 3210}
2709 3211
2710############################################################################# 3212#############################################################################
2711 3213
2712package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2713 3215
2714our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2715 3217
2716use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2717 3219
2718sub new { 3220sub new {
2719 my $class = shift; 3221 my $class = shift;
2720 3222
2721 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2724 ) 3226 )
2725} 3227}
2726 3228
2727sub set_tooltip_from { 3229sub set_tooltip_from {
2728 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
2729 3234
2730 my $tooltip = $widget->{tooltip}; 3235 my $tooltip = $widget->{tooltip};
2731 3236
2732 if ($ENV{CFPLUS_DEBUG} & 2) { 3237 if ($ENV{CFPLUS_DEBUG} & 2) {
2733 $tooltip .= "\n\n" . (ref $widget) . "\n" 3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
2734 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3239 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2735 . "req $widget->{req_w} $widget->{req_h}\n" 3240 . "req $widget->{req_w} $widget->{req_h}\n"
2736 . "visible $widget->{visible}"; 3241 . "visible $widget->{visible}";
2737 } 3242 }
2738 3243
3244 $tooltip =~ s/^\n+//;
3245 $tooltip =~ s/\n+$//;
3246
2739 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2740 markup => $tooltip, 3248 markup => $tooltip,
2741 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2742 fontsize => 0.8, 3250 fontsize => 0.8,
2743 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
2744 ellipsise => 0, 3252 ellipsise => 0,
2745 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2746 ); 3254 );
2747} 3255}
2748 3256
… …
2752 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3260 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2753 3261
2754 ($w + 4, $h + 4) 3262 ($w + 4, $h + 4)
2755} 3263}
2756 3264
2757sub size_allocate { 3265sub invoke_size_allocate {
2758 my ($self, $w, $h) = @_; 3266 my ($self, $w, $h) = @_;
2759 3267
2760 $self->SUPER::size_allocate ($w - 4, $h - 4); 3268 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2761} 3269}
2762 3270
2763sub visibility_change { 3271sub invoke_visibility_change {
2764 my ($self, $visible) = @_; 3272 my ($self, $visible) = @_;
2765 3273
2766 return unless $visible; 3274 return unless $visible;
2767 3275
2768 $self->{root}->on_post_alloc ("move_$self" => sub { 3276 $self->{root}->on_post_alloc ("move_$self" => sub {
2769 my $widget = $self->{owner} 3277 my $widget = $self->{owner}
2770 or return; 3278 or return;
2771 3279
3280 if ($widget->{visible}) {
2772 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2773 3282
2774 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2775 if $x + $self->{w} > $::WIDTH; 3284 if $x + $self->{w} > $self->{root}{w};
2776 3285
2777 $self->move_abs ($x, $y); 3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
2778 }); 3290 });
2779} 3291}
2780 3292
2781sub _draw { 3293sub _draw {
2782 my ($self) = @_; 3294 my ($self) = @_;
… …
2806 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
2807} 3319}
2808 3320
2809############################################################################# 3321#############################################################################
2810 3322
2811package CFClient::UI::Face; 3323package CFPlus::UI::Face;
2812 3324
2813our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
2814 3326
2815use CFClient::OpenGL; 3327use CFPlus::OpenGL;
2816 3328
2817sub new { 3329sub new {
2818 my $class = shift; 3330 my $class = shift;
2819 3331
2820 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
… …
2822 can_events => 0, 3334 can_events => 0,
2823 @_, 3335 @_,
2824 ); 3336 );
2825 3337
2826 if ($self->{anim} && $self->{animspeed}) { 3338 if ($self->{anim} && $self->{animspeed}) {
2827 Scalar::Util::weaken (my $widget = $self); 3339 CFPlus::weaken (my $widget = $self);
2828 3340
2829 $self->{timer} = Event->timer ( 3341 $self->{timer} = Event->timer (
2830 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3342 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2831 hard => 1, 3343 hard => 1,
2832 interval => $self->{animspeed}, 3344 interval => $self->{animspeed},
2833 cb => sub { 3345 cb => sub {
3346 delete $self->{wait_face};
2834 ++$widget->{frame}; 3347 ++$widget->{frame};
2835 $widget->update; 3348 $widget->update;
2836 }, 3349 },
2837 ); 3350 );
2838 } 3351 }
… …
2855sub _draw { 3368sub _draw {
2856 my ($self) = @_; 3369 my ($self) = @_;
2857 3370
2858 return unless $::CONN; 3371 return unless $::CONN;
2859 3372
3373 $self->SUPER::_draw;
3374
2860 my $face; 3375 my $face;
2861 3376
2862 if ($self->{frame}) { 3377 if ($self->{frame}) {
2863 my $anim = $::CONN->{anim}[$self->{anim}]; 3378 my $anim = $::CONN->{anim}[$self->{anim}];
2864 3379
2865 $face = $anim->[ $self->{frame} % @$anim ] 3380 $face = $anim->[ $self->{frame} % @$anim ]
2866 if $anim && @$anim; 3381 if $anim && @$anim;
2867 } 3382 }
3383
3384 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3385 or return;
2868 3386
2869 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3387 my $tex = $::CONN->{texture}[$faceid];
2870 3388
2871 if ($tex) { 3389 if ($tex) {
2872 glEnable GL_TEXTURE_2D; 3390 glEnable GL_TEXTURE_2D;
2873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2874 glColor 0, 0, 0, 1; 3392 glColor 0, 0, 0, 1;
2875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3393 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2876 glDisable GL_TEXTURE_2D; 3394 glDisable GL_TEXTURE_2D;
3395 } else {
3396 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3397 $self->update;
3398 });
2877 } 3399 }
2878} 3400}
2879 3401
2880sub DESTROY { 3402sub destroy {
2881 my ($self) = @_; 3403 my ($self) = @_;
2882 3404
2883 $self->{timer}->cancel 3405 $self->{timer}->cancel
2884 if $self->{timer}; 3406 if $self->{timer};
2885 3407
2886 $self->SUPER::DESTROY; 3408 $self->SUPER::destroy;
2887} 3409}
2888 3410
2889############################################################################# 3411#############################################################################
2890 3412
2891package CFClient::UI::Buttonbar; 3413package CFPlus::UI::Buttonbar;
2892 3414
2893our @ISA = CFClient::UI::HBox::; 3415our @ISA = CFPlus::UI::HBox::;
2894 3416
2895# TODO: should actualyl wrap buttons and other goodies. 3417# TODO: should actually wrap buttons and other goodies.
2896 3418
2897############################################################################# 3419#############################################################################
2898 3420
2899package CFClient::UI::Menu; 3421package CFPlus::UI::Menu;
2900 3422
2901our @ISA = CFClient::UI::FancyFrame::; 3423our @ISA = CFPlus::UI::Toplevel::;
2902 3424
2903use CFClient::OpenGL; 3425use CFPlus::OpenGL;
2904 3426
2905sub new { 3427sub new {
2906 my $class = shift; 3428 my $class = shift;
2907 3429
2908 my $self = $class->SUPER::new ( 3430 my $self = $class->SUPER::new (
2909 items => [], 3431 items => [],
2910 z => 100, 3432 z => 100,
2911 @_, 3433 @_,
2912 ); 3434 );
2913 3435
2914 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3436 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2915 3437
2916 for my $item (@{ $self->{items} }) { 3438 for my $item (@{ $self->{items} }) {
2917 my ($widget, $cb) = @$item; 3439 my ($widget, $cb, $tooltip) = @$item;
2918 3440
2919 # handle various types of items, only text for now 3441 # handle various types of items, only text for now
2920 if (!ref $widget) { 3442 if (!ref $widget) {
3443 if ($widget =~ /\t/) {
3444 my ($left, $right) = split /\t/, $widget, 2;
3445
2921 $widget = new CFClient::UI::Label 3446 $widget = new CFPlus::UI::HBox
2922 can_hover => 1, 3447 can_hover => 1,
2923 can_events => 1, 3448 can_events => 1,
3449 tooltip => $tooltip,
3450 children => [
3451 (new CFPlus::UI::Label markup => $left, expand => 1),
3452 (new CFPlus::UI::Label markup => $right, align => +1),
3453 ],
3454 ;
3455
3456 } else {
3457 $widget = new CFPlus::UI::Label
3458 can_hover => 1,
3459 can_events => 1,
2924 text => $widget; 3460 markup => $widget,
3461 tooltip => $tooltip;
3462 }
2925 } 3463 }
2926 3464
2927 $self->{item}{$widget} = $item; 3465 $self->{item}{$widget} = $item;
2928 3466
2929 $self->{vbox}->add ($widget); 3467 $self->{vbox}->add ($widget);
… …
2934 3472
2935# popup given the event (must be a mouse button down event currently) 3473# popup given the event (must be a mouse button down event currently)
2936sub popup { 3474sub popup {
2937 my ($self, $ev) = @_; 3475 my ($self, $ev) = @_;
2938 3476
2939 $self->_emit ("popdown"); 3477 $self->emit ("popdown");
2940 3478
2941 # maybe save $GRAB? must be careful about events... 3479 # maybe save $GRAB? must be careful about events...
2942 $GRAB = $self; 3480 $GRAB = $self;
2943 $self->{button} = $ev->{button}; 3481 $self->{button} = $ev->{button};
2944 3482
2945 $self->show; 3483 $self->show;
2946 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3484 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2947} 3485}
2948 3486
2949sub mouse_motion { 3487sub invoke_mouse_motion {
2950 my ($self, $ev, $x, $y) = @_; 3488 my ($self, $ev, $x, $y) = @_;
2951 3489
2952 # TODO: should use vbox->find_widget or so 3490 # TODO: should use vbox->find_widget or so
2953 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3491 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2954 $self->{hover} = $self->{item}{$HOVER}; 3492 $self->{hover} = $self->{item}{$HOVER};
2955 3493
2956 0 3494 0
2957} 3495}
2958 3496
2959sub button_up { 3497sub invoke_button_up {
2960 my ($self, $ev, $x, $y) = @_; 3498 my ($self, $ev, $x, $y) = @_;
2961 3499
2962 if ($ev->{button} == $self->{button}) { 3500 if ($ev->{button} == $self->{button}) {
2963 undef $GRAB; 3501 undef $GRAB;
2964 $self->hide; 3502 $self->hide;
2965 3503
2966 $self->_emit ("popdown"); 3504 $self->emit ("popdown");
2967 $self->{hover}[1]->() if $self->{hover}; 3505 $self->{hover}[1]->() if $self->{hover};
2968 } else { 3506 } else {
2969 return 0 3507 return 0
2970 } 3508 }
2971 3509
2972 1 3510 1
2973} 3511}
2974 3512
2975############################################################################# 3513#############################################################################
2976 3514
2977package CFClient::UI::Multiplexer; 3515package CFPlus::UI::Multiplexer;
2978 3516
2979our @ISA = CFClient::UI::Container::; 3517our @ISA = CFPlus::UI::Container::;
2980 3518
2981sub new { 3519sub new {
2982 my $class = shift; 3520 my $class = shift;
2983 3521
2984 my $self = $class->SUPER::new ( 3522 my $self = $class->SUPER::new (
… …
2998 3536
2999 $self->{current} = $self->{children}[0] 3537 $self->{current} = $self->{children}[0]
3000 if @{ $self->{children} }; 3538 if @{ $self->{children} };
3001} 3539}
3002 3540
3541sub get_current_page {
3542 my ($self) = @_;
3543
3544 $self->{current}
3545}
3546
3003sub set_current_page { 3547sub set_current_page {
3004 my ($self, $page_or_widget) = @_; 3548 my ($self, $page_or_widget) = @_;
3005 3549
3006 my $widget = ref $page_or_widget 3550 my $widget = ref $page_or_widget
3007 ? $page_or_widget 3551 ? $page_or_widget
3008 : $self->{children}[$page_or_widget]; 3552 : $self->{children}[$page_or_widget];
3009 3553
3010 $self->{current} = $widget; 3554 $self->{current} = $widget;
3011 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3555 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3012 3556
3013 $self->_emit (page_changed => $self->{current}); 3557 $self->emit (page_changed => $self->{current});
3014 3558
3015 $self->realloc; 3559 $self->realloc;
3016} 3560}
3017 3561
3018sub visible_children { 3562sub visible_children {
… …
3023 my ($self) = @_; 3567 my ($self) = @_;
3024 3568
3025 $self->{current}->size_request 3569 $self->{current}->size_request
3026} 3570}
3027 3571
3028sub size_allocate { 3572sub invoke_size_allocate {
3029 my ($self, $w, $h) = @_; 3573 my ($self, $w, $h) = @_;
3030 3574
3031 $self->{current}->configure (0, 0, $w, $h); 3575 $self->{current}->configure (0, 0, $w, $h);
3576
3577 1
3032} 3578}
3033 3579
3034sub _draw { 3580sub _draw {
3035 my ($self) = @_; 3581 my ($self) = @_;
3036 3582
3037 $self->{current}->draw; 3583 $self->{current}->draw;
3038} 3584}
3039 3585
3040############################################################################# 3586#############################################################################
3041 3587
3042package CFClient::UI::Notebook; 3588package CFPlus::UI::Notebook;
3043 3589
3044our @ISA = CFClient::UI::VBox::; 3590our @ISA = CFPlus::UI::VBox::;
3045 3591
3046sub new { 3592sub new {
3047 my $class = shift; 3593 my $class = shift;
3048 3594
3049 my $self = $class->SUPER::new ( 3595 my $self = $class->SUPER::new (
3050 buttonbar => (new CFClient::UI::Buttonbar), 3596 buttonbar => (new CFPlus::UI::Buttonbar),
3051 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3597 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3052 # filter => # will be put between multiplexer and $self 3598 # filter => # will be put between multiplexer and $self
3053 @_, 3599 @_,
3054 ); 3600 );
3055 3601
3056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3602 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3060} 3606}
3061 3607
3062sub add { 3608sub add {
3063 my ($self, $title, $widget, $tooltip) = @_; 3609 my ($self, $title, $widget, $tooltip) = @_;
3064 3610
3065 Scalar::Util::weaken $self; 3611 CFPlus::weaken $self;
3066 3612
3067 $self->{buttonbar}->add (new CFClient::UI::Button 3613 $self->{buttonbar}->add (new CFPlus::UI::Button
3068 markup => $title, 3614 markup => $title,
3069 tooltip => $tooltip, 3615 tooltip => $tooltip,
3070 on_activate => sub { $self->set_current_page ($widget) }, 3616 on_activate => sub { $self->set_current_page ($widget) },
3071 ); 3617 );
3072 3618
3073 $self->{multiplexer}->add ($widget); 3619 $self->{multiplexer}->add ($widget);
3074} 3620}
3075 3621
3622sub get_current_page {
3623 my ($self) = @_;
3624
3625 $self->{multiplexer}->get_current_page
3626}
3627
3076sub set_current_page { 3628sub set_current_page {
3077 my ($self, $page) = @_; 3629 my ($self, $page) = @_;
3078 3630
3079 $self->{multiplexer}->set_current_page ($page); 3631 $self->{multiplexer}->set_current_page ($page);
3080 $self->_emit (page_changed => $self->{multiplexer}{current}); 3632 $self->emit (page_changed => $self->{multiplexer}{current});
3081} 3633}
3082 3634
3083############################################################################# 3635#############################################################################
3084 3636
3637package CFPlus::UI::Selector;
3638
3639use utf8;
3640
3641our @ISA = CFPlus::UI::Button::;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
3647 options => [], # [value, title, longdesc], ...
3648 value => undef,
3649 @_,
3650 );
3651
3652 $self->_set_value ($self->{value});
3653
3654 $self
3655}
3656
3657sub invoke_button_down {
3658 my ($self, $ev) = @_;
3659
3660 my @menu_items;
3661
3662 for (@{ $self->{options} }) {
3663 my ($value, $title, $tooltip) = @$_;
3664
3665 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3666 }
3667
3668 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3669}
3670
3671sub _set_value {
3672 my ($self, $value) = @_;
3673
3674 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3675 or return;
3676
3677 $self->{value} = $item->[0];
3678 $self->set_markup ("$item->[1] ⇓");
3679 $self->set_tooltip ($item->[2]);
3680}
3681
3682sub set_value {
3683 my ($self, $value) = @_;
3684
3685 return unless $self->{value} ne $value;
3686
3687 $self->_set_value ($value);
3688 $self->emit (changed => $value);
3689}
3690
3691#############################################################################
3692
3085package CFClient::UI::Statusbox; 3693package CFPlus::UI::Statusbox;
3086 3694
3087our @ISA = CFClient::UI::VBox::; 3695our @ISA = CFPlus::UI::VBox::;
3088 3696
3089sub new { 3697sub new {
3090 my $class = shift; 3698 my $class = shift;
3091 3699
3092 my $self = $class->SUPER::new ( 3700 my $self = $class->SUPER::new (
3093 fontsize => 0.8, 3701 fontsize => 0.8,
3094 @_, 3702 @_,
3095 ); 3703 );
3096 3704
3097 Scalar::Util::weaken (my $this = $self); 3705 CFPlus::weaken (my $this = $self);
3098 3706
3099 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3707 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3100 3708
3101 $self 3709 $self
3102} 3710}
… …
3104sub reorder { 3712sub reorder {
3105 my ($self) = @_; 3713 my ($self) = @_;
3106 my $NOW = Time::HiRes::time; 3714 my $NOW = Time::HiRes::time;
3107 3715
3108 # freeze display when hovering over any label 3716 # freeze display when hovering over any label
3109 return if $CFClient::UI::TOOLTIP->{owner} 3717 return if $CFPlus::UI::TOOLTIP->{owner}
3110 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3718 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3111 values %{ $self->{item} }; 3719 values %{ $self->{item} };
3112 3720
3113 while (my ($k, $v) = each %{ $self->{item} }) { 3721 while (my ($k, $v) = each %{ $self->{item} }) {
3114 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3722 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3115 } 3723 }
… …
3136 for ($short) { 3744 for ($short) {
3137 s/^\s+//; 3745 s/^\s+//;
3138 s/\s+/ /g; 3746 s/\s+/ /g;
3139 } 3747 }
3140 3748
3141 new CFClient::UI::Label 3749 new CFPlus::UI::Label
3142 markup => $short, 3750 markup => $short,
3143 tooltip => $item->{tooltip}, 3751 tooltip => $item->{tooltip},
3144 tooltip_font => $::FONT_PROP, 3752 tooltip_font => $::FONT_PROP,
3145 tooltip_width => 0.67, 3753 tooltip_width => 0.67,
3146 fontsize => $item->{fontsize} || $self->{fontsize}, 3754 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3184 $item->{count}++; 3792 $item->{count}++;
3185 } else { 3793 } else {
3186 $item->{count} = 1; 3794 $item->{count} = 1;
3187 $item->{text} = $item->{tooltip} = $text; 3795 $item->{text} = $item->{tooltip} = $text;
3188 } 3796 }
3189 $item->{id} = ++$self->{id}; 3797 $item->{id} += 0.2;#d#
3190 $item->{timeout} = $timeout; 3798 $item->{timeout} = $timeout;
3191 delete $item->{label}; 3799 delete $item->{label};
3192 } else { 3800 } else {
3193 $self->{item}{$group} = { 3801 $self->{item}{$group} = {
3194 id => ++$self->{id}, 3802 id => ++$self->{id},
… …
3200 count => 1, 3808 count => 1,
3201 %arg, 3809 %arg,
3202 }; 3810 };
3203 } 3811 }
3204 3812
3813 $ROOT->on_refresh (reorder => sub {
3205 $self->reorder; 3814 $self->reorder;
3815 });
3206} 3816}
3207 3817
3208sub reconfigure { 3818sub reconfigure {
3209 my ($self) = @_; 3819 my ($self) = @_;
3210 3820
… …
3213 3823
3214 $self->reorder; 3824 $self->reorder;
3215 $self->SUPER::reconfigure; 3825 $self->SUPER::reconfigure;
3216} 3826}
3217 3827
3218sub DESTROY { 3828sub destroy {
3219 my ($self) = @_; 3829 my ($self) = @_;
3220 3830
3221 $self->{timer}->cancel; 3831 $self->{timer}->cancel;
3222 3832
3223 $self->SUPER::DESTROY; 3833 $self->SUPER::destroy;
3224} 3834}
3225 3835
3226############################################################################# 3836#############################################################################
3227 3837
3228package CFClient::UI::Inventory;
3229
3230our @ISA = CFClient::UI::ScrolledWindow::;
3231
3232sub new {
3233 my $class = shift;
3234
3235 my $self = $class->SUPER::new (
3236 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3237 @_,
3238 );
3239
3240 $self
3241}
3242
3243sub set_items {
3244 my ($self, $items) = @_;
3245
3246 $self->{child}->clear;
3247 return unless $items;
3248
3249 my @items = sort {
3250 ($a->{type} <=> $b->{type})
3251 or ($a->{name} cmp $b->{name})
3252 } @$items;
3253
3254 $self->{real_items} = \@items;
3255
3256 my $row = 0;
3257 for my $item (@items) {
3258 CFClient::Item::update_widgets $item;
3259
3260 $self->{child}->add (0, $row, $item->{face_widget});
3261 $self->{child}->add (1, $row, $item->{desc_widget});
3262 $self->{child}->add (2, $row, $item->{weight_widget});
3263
3264 $row++;
3265 }
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::BindEditor;
3271
3272our @ISA = CFClient::UI::FancyFrame::;
3273
3274sub new {
3275 my $class = shift;
3276
3277 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3278
3279 $self->add (my $vb = new CFClient::UI::VBox);
3280
3281
3282 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3283 text => "start recording",
3284 tooltip => "Start/Stops recording of actions."
3285 ."All subsequent actions after the recording started will be captured."
3286 ."The actions are displayed after the record was stopped."
3287 ."To bind the action you have to click on the 'Bind' button",
3288 on_activate => sub {
3289 unless ($self->{recording}) {
3290 $self->start;
3291 } else {
3292 $self->stop;
3293 }
3294 });
3295
3296 $vb->add (new CFClient::UI::Label text => "Actions:");
3297 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3298
3299 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3300 $vb->add (my $hb = new CFClient::UI::HBox);
3301 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3302 $hb->add (new CFClient::UI::Button
3303 text => "bind",
3304 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3305 on_activate => sub {
3306 $self->ask_for_bind;
3307 });
3308
3309 $vb->add (my $hb = new CFClient::UI::HBox);
3310 $hb->add (new CFClient::UI::Button
3311 text => "ok",
3312 expand => 1,
3313 tooltip => "This closes the binding editor and saves the binding",
3314 on_activate => sub {
3315 $self->hide;
3316 $self->commit;
3317 });
3318
3319 $hb->add (new CFClient::UI::Button
3320 text => "cancel",
3321 expand => 1,
3322 tooltip => "This closes the binding editor without saving",
3323 on_activate => sub {
3324 $self->hide;
3325 $self->{binding_cancel}->()
3326 if $self->{binding_cancel};
3327 });
3328
3329 $self->update_binding_widgets;
3330
3331 $self
3332}
3333
3334sub commit {
3335 my ($self) = @_;
3336 my ($mod, $sym, $cmds) = $self->get_binding;
3337 if ($sym != 0 && @$cmds > 0) {
3338 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3339 ."'. Don't forget 'Save Config'!");
3340 $self->{binding_change}->($mod, $sym, $cmds)
3341 if $self->{binding_change};
3342 } else {
3343 $::STATUSBOX->add ("No action bound, no key or action specified!");
3344 $self->{binding_cancel}->()
3345 if $self->{binding_cancel};
3346 }
3347}
3348
3349sub start {
3350 my ($self) = @_;
3351
3352 $self->{rec_btn}->set_text ("stop recording");
3353 $self->{recording} = 1;
3354 $self->clear_command_list;
3355 $::CONN->start_record if $::CONN;
3356}
3357
3358sub stop {
3359 my ($self) = @_;
3360
3361 $self->{rec_btn}->set_text ("start recording");
3362 $self->{recording} = 0;
3363
3364 my $rec;
3365 $rec = $::CONN->stop_record if $::CONN;
3366 return unless ref $rec eq 'ARRAY';
3367 $self->set_command_list ($rec);
3368}
3369
3370
3371sub ask_for_bind_and_commit {
3372 my ($self) = @_;
3373 $self->ask_for_bind (1);
3374}
3375
3376sub ask_for_bind {
3377 my ($self, $commit) = @_;
3378
3379 CFClient::Binder::open_binding_dialog (sub {
3380 my ($mod, $sym) = @_;
3381 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3382 $self->update_binding_widgets;
3383 $self->commit if $commit;
3384 });
3385}
3386
3387# $mod and $sym are the modifiers and key symbol
3388# $cmds is a array ref of strings (the commands)
3389# $cb is the callback that is executed on OK
3390# $ccb is the callback that is executed on CANCEL and
3391# when the binding was unsuccessful on OK
3392sub set_binding {
3393 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3394
3395 $self->clear_command_list;
3396 $self->{recording} = 0;
3397 $self->{rec_btn}->set_text ("start recording");
3398
3399 $self->{binding} = [$mod, $sym];
3400 $self->{commands} = $cmds;
3401
3402 $self->{binding_change} = $cb;
3403 $self->{binding_cancel} = $ccb;
3404
3405 $self->update_binding_widgets;
3406}
3407
3408# this is a shortcut method that asks for a binding
3409# and then just binds it.
3410sub do_quick_binding {
3411 my ($self, $cmds) = @_;
3412 $self->set_binding (undef, undef, $cmds, sub {
3413 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3414 });
3415 $self->ask_for_bind (1);
3416}
3417
3418sub update_binding_widgets {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3422 $self->set_command_list ($cmds);
3423}
3424
3425sub get_binding {
3426 my ($self) = @_;
3427 return (
3428 $self->{binding}->[0],
3429 $self->{binding}->[1],
3430 [ grep { defined $_ } @{$self->{commands}} ]
3431 );
3432}
3433
3434sub clear_command_list {
3435 my ($self) = @_;
3436 $self->{cmdbox}->clear ();
3437}
3438
3439sub set_command_list {
3440 my ($self, $cmds) = @_;
3441
3442 $self->{cmdbox}->clear ();
3443 $self->{commands} = $cmds;
3444
3445 my $idx = 0;
3446
3447 for (@$cmds) {
3448 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3449
3450 my $i = $idx;
3451 $hb->add (new CFClient::UI::Label text => $_);
3452 $hb->add (new CFClient::UI::Button
3453 text => "delete",
3454 tooltip => "Deletes the action from the record",
3455 on_activate => sub {
3456 $self->{cmdbox}->remove ($hb);
3457 $cmds->[$i] = undef;
3458 });
3459
3460
3461 $idx++
3462 }
3463}
3464
3465#############################################################################
3466
3467package CFClient::UI::SpellList;
3468
3469our @ISA = CFClient::UI::Table::;
3470
3471sub new {
3472 my $class = shift;
3473
3474 my $self = $class->SUPER::new (
3475 binding => [],
3476 commands => [],
3477 @_,
3478 )
3479}
3480
3481# XXX: Do sorting? Argl...
3482sub add_spell {
3483 my ($self, $spell) = @_;
3484 $self->{spells}->{$spell->{name}} = $spell;
3485
3486 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3487 face => $spell->{face},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message});
3491
3492 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3493 text => $spell->{name},
3494 can_hover => 1,
3495 can_events => 1,
3496 tooltip => $spell->{message},
3497 expand => 1);
3498
3499 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3500 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3501 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3502 expand => 1);
3503
3504 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3505 text => "bind to key",
3506 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3507}
3508
3509sub rebuild_spell_list {
3510 my ($self) = @_;
3511 $self->{tbl_idx} = 0;
3512 $self->add_spell ($_) for values %{$self->{spells}};
3513}
3514
3515sub remove_spell {
3516 my ($self, $spell) = @_;
3517 delete $self->{spells}->{$spell->{name}};
3518 $self->rebuild_spell_list;
3519}
3520
3521#############################################################################
3522
3523package CFClient::UI::Root; 3838package CFPlus::UI::Root;
3524 3839
3525our @ISA = CFClient::UI::Container::; 3840our @ISA = CFPlus::UI::Container::;
3526 3841
3527use List::Util qw(min max); 3842use List::Util qw(min max);
3528 3843
3529use CFClient::OpenGL; 3844use CFPlus::OpenGL;
3530 3845
3531sub new { 3846sub new {
3532 my $class = shift; 3847 my $class = shift;
3533 3848
3534 my $self = $class->SUPER::new ( 3849 my $self = $class->SUPER::new (
3535 visible => 1, 3850 visible => 1,
3536 @_, 3851 @_,
3537 ); 3852 );
3538 3853
3539 Scalar::Util::weaken ($self->{root} = $self); 3854 CFPlus::weaken ($self->{root} = $self);
3540 3855
3541 $self 3856 $self
3542} 3857}
3543 3858
3544sub size_request { 3859sub size_request {
… …
3559 $coord = $max - $size if $coord > $max - $size; 3874 $coord = $max - $size if $coord > $max - $size;
3560 3875
3561 int $coord + 0.5 3876 int $coord + 0.5
3562} 3877}
3563 3878
3564sub size_allocate { 3879sub invoke_size_allocate {
3565 my ($self, $w, $h) = @_; 3880 my ($self, $w, $h) = @_;
3566 3881
3567 for my $child ($self->children) { 3882 for my $child ($self->children) {
3568 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3883 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3569 3884
… …
3573 $X = _to_pixel $X, $W, $self->{w}; 3888 $X = _to_pixel $X, $W, $self->{w};
3574 $Y = _to_pixel $Y, $H, $self->{h}; 3889 $Y = _to_pixel $Y, $H, $self->{h};
3575 3890
3576 $child->configure ($X, $Y, $W, $H); 3891 $child->configure ($X, $Y, $W, $H);
3577 } 3892 }
3893
3894 1
3578} 3895}
3579 3896
3580sub coord2local { 3897sub coord2local {
3581 my ($self, $x, $y) = @_; 3898 my ($self, $x, $y) = @_;
3582 3899
… …
3708 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4025 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3709 4026
3710 $w = 0 if $w < 0; 4027 $w = 0 if $w < 0;
3711 $h = 0 if $h < 0; 4028 $h = 0 if $h < 0;
3712 4029
4030 $w = max $widget->{min_w}, $w;
4031 $h = max $widget->{min_h}, $h;
4032
4033# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4034# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4035
4036 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4037 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4038
3713 $w = int $w + 0.5; 4039 $w = int $w + 0.5;
3714 $h = int $h + 0.5; 4040 $h = int $h + 0.5;
3715 4041
3716 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4042 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3717 $widget->{old_w} = $widget->{w}; 4043 $widget->{old_w} = $widget->{w};
… …
3740 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4066 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3741 glMatrixMode GL_MODELVIEW; 4067 glMatrixMode GL_MODELVIEW;
3742 glLoadIdentity; 4068 glLoadIdentity;
3743 4069
3744 { 4070 {
3745 package CFClient::UI::Base; 4071 package CFPlus::UI::Base;
3746 4072
3747 ($draw_x, $draw_y, $draw_w, $draw_h) = 4073 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3748 (0, 0, $self->{w}, $self->{h}); 4074 (0, 0, $self->{w}, $self->{h});
3749 }
3750 4075
3751 $self->_draw; 4076 $self->_draw;
4077 }
3752} 4078}
3753 4079
3754############################################################################# 4080#############################################################################
3755 4081
3756package CFClient::UI; 4082package CFPlus::UI;
3757 4083
3758$ROOT = new CFClient::UI::Root; 4084$ROOT = new CFPlus::UI::Root;
3759$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4085$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3760 4086
37611 40871
3762 4088

Diff Legend

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