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

Diff Legend

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