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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 2007 UTC

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

Diff Legend

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