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.279 by root, Mon Jun 5 00:17:47 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 {
… …
381} 411}
382 412
383sub set_max_size { 413sub set_max_size {
384 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
385 415
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 416 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 417 $self->{max_h} = int $h if defined $h;
418
419 $self->realloc;
388} 420}
389 421
390sub set_tooltip { 422sub set_tooltip {
391 my ($self, $tooltip) = @_; 423 my ($self, $tooltip) = @_;
392 424
… …
395 427
396 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
397 429
398 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
399 431
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
403 } 435 }
404} 436}
405 437
406# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
407sub coord2local { 439sub coord2local {
408 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
409 441
442 Carp::confess unless $self->{parent};#d#
443
410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411} 445}
412 446
413# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
414sub coord2global { 448sub coord2global {
415 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
416 450
451 Carp::confess unless $self->{parent};#d#
452
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 454}
419 455
420sub focus_in { 456sub invoke_focus_in {
421 my ($self) = @_; 457 my ($self) = @_;
422 458
423 return if $FOCUS == $self; 459 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
425 461
426 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
427 463
428 $self->_emit (focus_in => $focus); 464 $self->update;
429 465
430 $focus->update if $focus; 466 0
431 $FOCUS->update;
432} 467}
433 468
434sub focus_out { 469sub invoke_focus_out {
435 my ($self) = @_; 470 my ($self) = @_;
436 471
437 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
438 473
439 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
440 475
441 $self->_emit (focus_out => $focus); 476 $self->update;
442 477
443 $focus->update if $focus; #?
444
445 $::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
446 unless $FOCUS; 479 unless $FOCUS;
447}
448 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
449sub mouse_motion { 0 } 491sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 492sub invoke_button_up { 0 }
451sub key_down { 0 } 493sub invoke_key_down { 0 }
452sub key_up { 0 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
453 496
454sub button_down { 497sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
456 499
457 $self->focus_in; 500 $self->grab_focus;
458 501
459 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)
460} 550}
461 551
462sub find_widget { 552sub find_widget {
463 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
464 554
… …
472} 562}
473 563
474sub set_parent { 564sub set_parent {
475 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
476 566
477 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 569}
503 570
504sub realloc { 571sub realloc {
505 my ($self) = @_; 572 my ($self) = @_;
506 573
… …
539 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
540 607
541 # update screen rectangle 608 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 611
547 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 615
… …
573 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
576 glEnd; 641 glEnd;
577 glPopMatrix; 642 glPopMatrix;
578 #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;
579 } 644 }
580 645
581 $self->_draw; 646 $self->_draw;
582 glPopMatrix; 647 glPopMatrix;
583} 648}
… …
586 my ($self) = @_; 651 my ($self) = @_;
587 652
588 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
589} 654}
590 655
656my $cntx;#d#
591sub DESTROY { 657sub DESTROY {
592 my ($self) = @_; 658 my ($self) = @_;
593 659
660 return if CFPlus::in_destruct;
661
662 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
594 delete $WIDGET{$self+0}; 665 delete $WIDGET{$self+0};
595 #$self->deactivate;
596} 666}
597 667
598############################################################################# 668#############################################################################
599 669
600package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
601 671
602our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
603 673
604use strict; 674use strict;
605use CFClient::OpenGL; 675use CFPlus::OpenGL;
606 676
607sub new { 677sub new {
608 my $class = shift; 678 my $class = shift;
609 679
610 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
641 } 711 }
642} 712}
643 713
644############################################################################# 714#############################################################################
645 715
646package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
647 717
648our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
649 719
650sub new { 720sub new {
651 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
653} 723}
… …
660 730
661sub draw { } 731sub draw { }
662 732
663############################################################################# 733#############################################################################
664 734
665package CFClient::UI::Container; 735package CFPlus::UI::Container;
666 736
667our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
668 738
669sub new { 739sub new {
670 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
671 741
672 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
681 if $children; 751 if $children;
682 752
683 $self 753 $self
684} 754}
685 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
686sub add { 764sub add {
687 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
688 766
689 $_->set_parent ($self) 767 $_->set_parent ($self)
690 for @widgets; 768 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
751} 829}
752 830
753############################################################################# 831#############################################################################
754 832
755package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
756 834
757our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
758 836
759sub new { 837sub new {
760 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
761 839
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 841
764 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
765} 843}
766 844
767sub add { 845sub add {
768 my ($self, $child) = @_; 846 my ($self, $child) = @_;
769 847
770 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
771
772 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
773} 850}
774 851
775sub remove { 852sub remove {
776 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
777 854
778 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
779 856
780 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
781 unless @{$self->{children}}; 858 unless @{$self->{children}};
782} 859}
783 860
784sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
785 862
786sub size_request { 863sub size_request {
787 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
788} 865}
789 866
790sub size_allocate { 867sub invoke_size_allocate {
791 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
792 869
793 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
794} 873}
795 874
796############################################################################# 875#############################################################################
797 876
798# back-buffered drawing area 877# back-buffered drawing area
799 878
800package CFClient::UI::Window; 879package CFPlus::UI::Window;
801 880
802our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
803 882
804use CFClient::OpenGL; 883use CFPlus::OpenGL;
805 884
806sub new { 885sub new {
807 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
808 887
809 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
814 893
815 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
816 $self->SUPER::update; 895 $self->SUPER::update;
817} 896}
818 897
819sub size_allocate { 898sub invoke_size_allocate {
820 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
821 900
822 $self->SUPER::size_allocate ($w, $h);
823 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
824} 904}
825 905
826sub _render { 906sub _render {
827 my ($self) = @_; 907 my ($self) = @_;
828 908
… …
830} 910}
831 911
832sub render_child { 912sub render_child {
833 my ($self) = @_; 913 my ($self) = @_;
834 914
835 $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 {
836 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
837 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
838 918
839 { 919 {
840 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
841 921
842 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
844 } 926 }
845
846 $self->_render;
847 }; 927 };
848} 928}
849 929
850sub _draw { 930sub _draw {
851 my ($self) = @_; 931 my ($self) = @_;
852
853 my ($w, $h) = @$self{qw(w h)};
854 932
855 my $tex = $self->{texture} 933 my $tex = $self->{texture}
856 or return; 934 or return;
857 935
858 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
861 939
862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
863 941
864 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
865} 943}
866 944
867############################################################################# 945#############################################################################
868 946
869package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
870 948
871our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
872 950
873sub new { 951sub new {
874 my $class = shift; 952 my $class = shift;
875 953
876 $class->SUPER::new ( 954 $class->SUPER::new (
… …
889 $h = 10 if $self->{scroll_y}; 967 $h = 10 if $self->{scroll_y};
890 968
891 ($w, $h) 969 ($w, $h)
892} 970}
893 971
894sub size_allocate { 972sub invoke_size_allocate {
895 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
896 974
897 my $child = $self->child; 975 my $child = $self->child;
898 976
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901 979
902 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
903 $self->update; 981 $self->update;
982
983 1
904} 984}
905 985
906sub set_offset { 986sub set_offset {
907 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
908 988
… …
934 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
935 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
936 ) { 1016 ) {
937 $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})
938 } else { 1018 } else {
939 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
940 } 1020 }
941} 1021}
942 1022
943sub _render { 1023sub _render {
944 my ($self) = @_; 1024 my ($self) = @_;
945 1025
946 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};
947 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};
948 1028
949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
950 1030
951 $self->SUPER::_render; 1031 $self->SUPER::_render;
952} 1032}
953 1033
954############################################################################# 1034#############################################################################
955 1035
956package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
957 1037
958our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
959 1039
960sub new { 1040sub new {
961 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
962 1042
963 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
964 1044
965 my $self; 1045 my $self;
966 1046
967 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
968 vertical => 1, 1057 vertical => 1,
969 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
970 on_changed => sub { 1059 on_changed => sub {
971 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
972 }, 1062 },
973 ; 1063 ;
974 1064
975 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
976 vp => (new CFClient::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1067 can_events => 1,
977 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
978 %arg, 1072 %arg,
979 ); 1073 );
980 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
981 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
982 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
983 1080
984 $self 1081 $self
985} 1082}
1083
1084#TODO# update range on size_allocate depending on child
986 1085
987sub add { 1086sub add {
988 my ($self, $widget) = @_; 1087 my ($self, $widget) = @_;
989 1088
990 $self->{vp}->add ($self->{child} = $widget); 1089 $self->{vp}->add ($self->{child} = $widget);
991} 1090}
992 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
993sub update { 1114sub update {
994 my ($self) = @_; 1115 my ($self) = @_;
995 1116
996 $self->SUPER::update; 1117 $self->SUPER::update;
997 1118 $self->update_slider;
998 # todo: overwrite size_allocate of child
999 my $child = $self->{vp}->child;
1000 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1001} 1119}
1002 1120
1003sub size_allocate { 1121sub invoke_size_allocate {
1004 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
1005 1123
1124 $self->update_slider;
1006 $self->SUPER::size_allocate ($w, $h); 1125 $self->SUPER::invoke_size_allocate ($w, $h)
1007
1008 my $child = $self->{vp}->child;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010} 1126}
1011
1012#TODO# update range on size_allocate depending on child
1013# update viewport offset on scroll
1014 1127
1015############################################################################# 1128#############################################################################
1016 1129
1017package CFClient::UI::Frame; 1130package CFPlus::UI::Frame;
1018 1131
1019our @ISA = CFClient::UI::Bin::; 1132our @ISA = CFPlus::UI::Bin::;
1020 1133
1021use CFClient::OpenGL; 1134use CFPlus::OpenGL;
1022 1135
1023sub new { 1136sub new {
1024 my $class = shift; 1137 my $class = shift;
1025 1138
1026 $class->SUPER::new ( 1139 $class->SUPER::new (
… …
1052 $self->SUPER::_draw; 1165 $self->SUPER::_draw;
1053} 1166}
1054 1167
1055############################################################################# 1168#############################################################################
1056 1169
1057package CFClient::UI::FancyFrame; 1170package CFPlus::UI::FancyFrame;
1058 1171
1059our @ISA = CFClient::UI::Bin::; 1172our @ISA = CFPlus::UI::Bin::;
1060 1173
1061use CFClient::OpenGL; 1174use CFPlus::OpenGL;
1062
1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1070 1175
1071sub new { 1176sub new {
1072 my ($class, %arg) = @_; 1177 my ($class, %arg) = @_;
1073 1178
1074 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) = @_;
1075 1286
1076 my $self = $class->SUPER::new ( 1287 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1288 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1289 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1290 border => 0.6,
1080 can_events => 1, 1291 can_events => 1,
1081 min_w => 16, 1292 min_w => 64,
1082 min_h => 16, 1293 min_h => 32,
1083 %arg, 1294 %arg,
1084 ); 1295 );
1085 1296
1086 $self->{title} = new CFClient::UI::Label 1297 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 1298 align => 0,
1088 valign => 1, 1299 valign => 1,
1089 text => $title, 1300 text => $self->{title},
1090 fontsize => $self->{border} 1301 fontsize => $self->{border},
1091 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 }
1092 1312
1093 $self 1313 $self
1094} 1314}
1095 1315
1096sub add { 1316sub add {
1097 my ($self, @widgets) = @_; 1317 my ($self, @widgets) = @_;
1098 1318
1099 $self->SUPER::add (@widgets); 1319 $self->SUPER::add (@widgets);
1320 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1321 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1101} 1322}
1102 1323
1103sub border { 1324sub border {
1104 int $_[0]{border} * $::FONTSIZE 1325 int $_[0]{border} * $::FONTSIZE
1105} 1326}
1106 1327
1107sub size_request { 1328sub size_request {
1108 my ($self) = @_; 1329 my ($self) = @_;
1109 1330
1110 $self->{title}->size_request 1331 $self->{title_widget}->size_request
1111 if $self->{title}; 1332 if $self->{title_widget};
1333
1334 $self->{close_button}->size_request
1335 if $self->{close_button};
1112 1336
1113 my ($w, $h) = $self->SUPER::size_request; 1337 my ($w, $h) = $self->SUPER::size_request;
1114 1338
1115 ( 1339 (
1116 $w + $self->border * 2, 1340 $w + $self->border * 2,
1117 $h + $self->border * 2, 1341 $h + $self->border * 2,
1118 ) 1342 )
1119} 1343}
1120 1344
1121sub size_allocate { 1345sub invoke_size_allocate {
1122 my ($self, $w, $h) = @_; 1346 my ($self, $w, $h) = @_;
1123 1347
1124 if ($self->{title}) { 1348 if ($self->{title_widget}) {
1125 $self->{title}{w} = $w; 1349 $self->{title_widget}{w} = $w;
1126 $self->{title}{h} = $h; 1350 $self->{title_widget}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h); 1351 $self->{title_widget}->invoke_size_allocate ($w, $h);
1128 } 1352 }
1129 1353
1130 my $border = $self->border; 1354 my $border = $self->border;
1131 1355
1132 $h -= List::Util::max 0, $border * 2; 1356 $h -= List::Util::max 0, $border * 2;
1133 $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;
1134 1371
1135 $self->child->configure ($border, $border, $w, $h); 1372 1
1136} 1373}
1137 1374
1138sub button_down { 1375sub invoke_button_down {
1139 my ($self, $ev, $x, $y) = @_; 1376 my ($self, $ev, $x, $y) = @_;
1140 1377
1141 my ($w, $h) = @$self{qw(w h)}; 1378 my ($w, $h) = @$self{qw(w h)};
1142 my $border = $self->border; 1379 my $border = $self->border;
1143 1380
… …
1174 1411
1175 ($x, $y) = ($ev->{x}, $ev->{y}); 1412 ($x, $y) = ($ev->{x}, $ev->{y});
1176 1413
1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1414 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1178 # HACK: the next line is required to enforce placement 1415 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1416 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1180 }; 1417 };
1181 } else { 1418 } else {
1182 return 0; 1419 return 0;
1183 } 1420 }
1184 1421
1185 1 1422 1
1186} 1423}
1187 1424
1188sub button_up { 1425sub invoke_button_up {
1189 my ($self, $ev, $x, $y) = @_; 1426 my ($self, $ev, $x, $y) = @_;
1190 1427
1191 !!delete $self->{motion} 1428 ! ! delete $self->{motion}
1192} 1429}
1193 1430
1194sub mouse_motion { 1431sub invoke_mouse_motion {
1195 my ($self, $ev, $x, $y) = @_; 1432 my ($self, $ev, $x, $y) = @_;
1196 1433
1197 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1434 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198 1435
1199 !!$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
1200} 1445}
1201 1446
1202sub _draw { 1447sub _draw {
1203 my ($self) = @_; 1448 my ($self) = @_;
1204 1449
… …
1230 1475
1231 glDisable GL_TEXTURE_2D; 1476 glDisable GL_TEXTURE_2D;
1232 1477
1233 $child->draw; 1478 $child->draw;
1234 1479
1235 if ($self->{title}) { 1480 if ($self->{title_widget}) {
1236 glTranslate 0, $border - $self->{h}; 1481 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw; 1482 $self->{title_widget}->_draw;
1483
1484 glTranslate 0, - ($border - $self->{h});
1238 } 1485 }
1486
1487 $self->{close_button}->draw
1488 if $self->{close_button};
1239} 1489}
1240 1490
1241############################################################################# 1491#############################################################################
1242 1492
1243package CFClient::UI::Table; 1493package CFPlus::UI::Table;
1244 1494
1245our @ISA = CFClient::UI::Base::; 1495our @ISA = CFPlus::UI::Base::;
1246 1496
1247use List::Util qw(max sum); 1497use List::Util qw(max sum);
1248 1498
1249use CFClient::OpenGL; 1499use CFPlus::OpenGL;
1250 1500
1251sub new { 1501sub new {
1252 my $class = shift; 1502 my $class = shift;
1253 1503
1254 $class->SUPER::new ( 1504 $class->SUPER::new (
1255 col_expand => [], 1505 col_expand => [],
1506 row_expand => [],
1256 @_, 1507 @_,
1257 ) 1508 )
1258} 1509}
1259 1510
1260sub children { 1511sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1512 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1262} 1513}
1263 1514
1264sub add { 1515sub add {
1265 my ($self, $x, $y, $child) = @_; 1516 my ($self) = shift;
1266 1517
1518 while (@_) {
1519 my ($x, $y, $child) = splice @_, 0, 3, ();
1267 $child->set_parent ($self); 1520 $child->set_parent ($self);
1268 $self->{children}[$y][$x] = $child; 1521 $self->{children}[$y][$x] = $child;
1522 }
1269 1523
1524 $self->{force_realloc} = 1;
1525 $self->{force_size_alloc} = 1;
1270 $self->realloc; 1526 $self->realloc;
1527}
1528
1529sub remove {
1530 my ($self, $child) = @_;
1531
1532 # TODO: not yet implemented
1271} 1533}
1272 1534
1273# 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?
1274sub clear { 1536sub clear {
1275 my ($self) = @_; 1537 my ($self) = @_;
… …
1316 (sum @$ws), 1578 (sum @$ws),
1317 (sum @$hs), 1579 (sum @$hs),
1318 ) 1580 )
1319} 1581}
1320 1582
1321sub size_allocate { 1583sub invoke_size_allocate {
1322 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1323 1585
1324 my ($ws, $hs) = $self->get_wh; 1586 my ($ws, $hs) = $self->get_wh;
1325 1587
1326 my $req_w = (sum @$ws) || 1; 1588 my $req_w = (sum @$ws) || 1;
1327 my $req_h = (sum @$hs) || 1; 1589 my $req_h = (sum @$hs) || 1;
1328 1590
1329 # TODO: nicer code && do row_expand 1591 # TODO: nicer code
1330 my @col_expand = @{$self->{col_expand}}; 1592 my @col_expand = @{$self->{col_expand}};
1331 @col_expand = (1) x @$ws unless @col_expand; 1593 @col_expand = (1) x @$ws unless @col_expand;
1332 my $col_expand = (sum @col_expand) || 1; 1594 my $col_expand = (sum @col_expand) || 1;
1333 1595
1334 # linearly scale sizes
1335 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1596 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1336 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1337 1597
1338 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
1339 CFClient::UI::harmonize $hs; 1606 CFPlus::UI::harmonize $hs;
1340 1607
1341 my $y; 1608 my $y;
1342 1609
1343 for my $r (0 .. $#{$self->{children}}) { 1610 for my $r (0 .. $#{$self->{children}}) {
1344 my $row = $self->{children}[$r] 1611 my $row = $self->{children}[$r]
… …
1358 } 1625 }
1359 1626
1360 $y += $row_h; 1627 $y += $row_h;
1361 } 1628 }
1362 1629
1630 1
1363} 1631}
1364 1632
1365sub find_widget { 1633sub find_widget {
1366 my ($self, $x, $y) = @_; 1634 my ($self, $x, $y) = @_;
1367 1635
… …
1386 } 1654 }
1387} 1655}
1388 1656
1389############################################################################# 1657#############################################################################
1390 1658
1391package CFClient::UI::Box; 1659package CFPlus::UI::Box;
1392 1660
1393our @ISA = CFClient::UI::Container::; 1661our @ISA = CFPlus::UI::Container::;
1394 1662
1395sub size_request { 1663sub size_request {
1396 my ($self) = @_; 1664 my ($self) = @_;
1397 1665
1398 $self->{vertical} 1666 $self->{vertical}
… …
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1672 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1673 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 ) 1674 )
1407} 1675}
1408 1676
1409sub size_allocate { 1677sub invoke_size_allocate {
1410 my ($self, $w, $h) = @_; 1678 my ($self, $w, $h) = @_;
1411 1679
1412 my $space = $self->{vertical} ? $h : $w; 1680 my $space = $self->{vertical} ? $h : $w;
1413 my $children = $self->{children}; 1681 my @children = $self->visible_children;
1414 1682
1415 my @req; 1683 my @req;
1416 1684
1417 if ($self->{homogeneous}) { 1685 if ($self->{homogeneous}) {
1418 @req = ($space / (@$children || 1)) x @$children; 1686 @req = ($space / (@children || 1)) x @children;
1419 } else { 1687 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1688 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1421 my $req = List::Util::sum @req; 1689 my $req = List::Util::sum @req;
1422 1690
1423 if ($req > $space) { 1691 if ($req > $space) {
1424 # ah well, not enough space 1692 # ah well, not enough space
1425 $_ *= $space / $req for @req; 1693 $_ *= $space / $req for @req;
1426 } else { 1694 } else {
1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1695 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1428 1696
1429 $space = ($space - $req) / $expand; # remaining space to give away 1697 $space = ($space - $req) / $expand; # remaining space to give away
1430 1698
1431 $req[$_] += $space * $children->[$_]{expand} 1699 $req[$_] += $space * $children[$_]{expand}
1432 for 0 .. $#$children; 1700 for 0 .. $#children;
1433 } 1701 }
1434 } 1702 }
1435 1703
1436 CFClient::UI::harmonize \@req; 1704 CFPlus::UI::harmonize \@req;
1437 1705
1438 my $pos = 0; 1706 my $pos = 0;
1439 for (0 .. $#$children) { 1707 for (0 .. $#children) {
1440 my $alloc = $req[$_]; 1708 my $alloc = $req[$_];
1441 $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));
1442 1710
1443 $pos += $alloc; 1711 $pos += $alloc;
1444 } 1712 }
1445 1713
1446 1 1714 1
1447} 1715}
1448 1716
1449############################################################################# 1717#############################################################################
1450 1718
1451package CFClient::UI::HBox; 1719package CFPlus::UI::HBox;
1452 1720
1453our @ISA = CFClient::UI::Box::; 1721our @ISA = CFPlus::UI::Box::;
1454 1722
1455sub new { 1723sub new {
1456 my $class = shift; 1724 my $class = shift;
1457 1725
1458 $class->SUPER::new ( 1726 $class->SUPER::new (
… …
1461 ) 1729 )
1462} 1730}
1463 1731
1464############################################################################# 1732#############################################################################
1465 1733
1466package CFClient::UI::VBox; 1734package CFPlus::UI::VBox;
1467 1735
1468our @ISA = CFClient::UI::Box::; 1736our @ISA = CFPlus::UI::Box::;
1469 1737
1470sub new { 1738sub new {
1471 my $class = shift; 1739 my $class = shift;
1472 1740
1473 $class->SUPER::new ( 1741 $class->SUPER::new (
… …
1476 ) 1744 )
1477} 1745}
1478 1746
1479############################################################################# 1747#############################################################################
1480 1748
1481package CFClient::UI::Label; 1749package CFPlus::UI::Label;
1482 1750
1483our @ISA = CFClient::UI::DrawBG::; 1751our @ISA = CFPlus::UI::DrawBG::;
1484 1752
1485use CFClient::OpenGL; 1753use CFPlus::OpenGL;
1486 1754
1487sub new { 1755sub new {
1488 my ($class, %arg) = @_; 1756 my ($class, %arg) = @_;
1489 1757
1490 my $self = $class->SUPER::new ( 1758 my $self = $class->SUPER::new (
… …
1493 #active_bg => none 1761 #active_bg => none
1494 #font => default_font 1762 #font => default_font
1495 #text => initial text 1763 #text => initial text
1496 #markup => initial narkup 1764 #markup => initial narkup
1497 #max_w => maximum pixel width 1765 #max_w => maximum pixel width
1766 #style => 0, # render flags
1498 ellipsise => 3, # end 1767 ellipsise => 3, # end
1499 layout => (new CFClient::Layout), 1768 layout => (new CFPlus::Layout),
1500 fontsize => 1, 1769 fontsize => 1,
1501 align => -1, 1770 align => -1,
1502 valign => -1, 1771 valign => -1,
1503 padding_x => 2, 1772 padding_x => 2,
1504 padding_y => 2, 1773 padding_y => 2,
1505 can_events => 0, 1774 can_events => 0,
1506 %arg 1775 %arg
1507 ); 1776 );
1508 1777
1509 if (exists $self->{template}) { 1778 if (exists $self->{template}) {
1510 my $layout = new CFClient::Layout; 1779 my $layout = new CFPlus::Layout;
1511 $layout->set_text (delete $self->{template}); 1780 $layout->set_text (delete $self->{template});
1512 $self->{template} = $layout; 1781 $self->{template} = $layout;
1513 } 1782 }
1514 1783
1515 if (exists $self->{markup}) { 1784 if (exists $self->{markup}) {
… …
1519 } 1788 }
1520 1789
1521 $self 1790 $self
1522} 1791}
1523 1792
1524sub escape($) {
1525 local $_ = $_[0];
1526
1527 s/&/&amp;/g;
1528 s/>/&gt;/g;
1529 s/</&lt;/g;
1530
1531 $_
1532}
1533
1534sub update { 1793sub update {
1535 my ($self) = @_; 1794 my ($self) = @_;
1536 1795
1537 delete $self->{texture}; 1796 delete $self->{texture};
1538 $self->SUPER::update; 1797 $self->SUPER::update;
1539} 1798}
1540 1799
1800sub realloc {
1801 my ($self) = @_;
1802
1803 delete $self->{ox};
1804 $self->SUPER::realloc;
1805}
1806
1541sub set_text { 1807sub set_text {
1542 my ($self, $text) = @_; 1808 my ($self, $text) = @_;
1543 1809
1544 return if $self->{text} eq "T$text"; 1810 return if $self->{text} eq "T$text";
1545 $self->{text} = "T$text"; 1811 $self->{text} = "T$text";
1546 1812
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1548 $self->{layout}->set_text ($text); 1813 $self->{layout}->set_text ($text);
1549 1814
1815 delete $self->{size_req};
1550 $self->realloc; 1816 $self->realloc;
1551 $self->update; 1817 $self->update;
1552} 1818}
1553 1819
1554sub set_markup { 1820sub set_markup {
… …
1557 return if $self->{text} eq "M$markup"; 1823 return if $self->{text} eq "M$markup";
1558 $self->{text} = "M$markup"; 1824 $self->{text} = "M$markup";
1559 1825
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1826 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561 1827
1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1563 $self->{layout}->set_markup ($markup); 1828 $self->{layout}->set_markup ($markup);
1564 1829
1830 delete $self->{size_req};
1565 $self->realloc; 1831 $self->realloc;
1566 $self->update; 1832 $self->update;
1567} 1833}
1568 1834
1569sub size_request { 1835sub size_request {
1570 my ($self) = @_; 1836 my ($self) = @_;
1571 1837
1838 $self->{size_req} ||= do {
1572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1839 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1); 1840 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1841 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1842 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1843 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577 1844
1578 my ($w, $h) = $self->{layout}->size; 1845 my ($w, $h) = $self->{layout}->size;
1579 1846
1580 if (exists $self->{template}) { 1847 if (exists $self->{template}) {
1581 $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);
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1850 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 1851
1584 my ($w2, $h2) = $self->{template}->size; 1852 my ($w2, $h2) = $self->{template}->size;
1585 1853
1586 $w = List::Util::max $w, $w2; 1854 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2; 1855 $h = List::Util::max $h, $h2;
1856 }
1857
1858 [$w, $h]
1588 } 1859 };
1589 1860
1590 ($w, $h) 1861 @{ $self->{size_req} }
1591} 1862}
1592 1863
1864sub baseline_shift {
1865 $_[0]{layout}->descent
1866}
1867
1593sub size_allocate { 1868sub invoke_size_allocate {
1594 my ($self, $w, $h) = @_; 1869 my ($self, $w, $h) = @_;
1595 1870
1596 delete $self->{ox}; 1871 delete $self->{ox};
1597 1872
1598 delete $self->{texture} 1873 delete $self->{texture}
1599 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
1600} 1877}
1601 1878
1602sub set_fontsize { 1879sub set_fontsize {
1603 my ($self, $fontsize) = @_; 1880 my ($self, $fontsize) = @_;
1604 1881
1605 $self->{fontsize} = $fontsize; 1882 $self->{fontsize} = $fontsize;
1883 delete $self->{size_req};
1606 delete $self->{texture}; 1884 delete $self->{texture};
1607 1885
1608 $self->realloc; 1886 $self->realloc;
1609} 1887}
1610 1888
1889sub reconfigure {
1890 my ($self) = @_;
1891
1892 delete $self->{size_req};
1893 delete $self->{texture};
1894
1895 $self->SUPER::reconfigure;
1896}
1897
1611sub _draw { 1898sub _draw {
1612 my ($self) = @_; 1899 my ($self) = @_;
1613 1900
1614 $self->SUPER::_draw; # draw background, if applicable 1901 $self->SUPER::_draw; # draw background, if applicable
1615 1902
1616 my $tex = $self->{texture} ||= do { 1903 my $size = $self->{texture} ||= do {
1617 $self->{layout}->set_foreground (@{$self->{fg}}); 1904 $self->{layout}->set_foreground (@{$self->{fg}});
1618 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1905 $self->{layout}->set_font ($self->{font}) if $self->{font};
1619 $self->{layout}->set_width ($self->{w}); 1906 $self->{layout}->set_width ($self->{w});
1620 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1907 $self->{layout}->set_ellipsise ($self->{ellipsise});
1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1908 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1909 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1910
1624 new_from_layout CFClient::Texture $self->{layout} 1911 [$self->{layout}->size]
1625 }; 1912 };
1626 1913
1627 unless (exists $self->{ox}) { 1914 unless (exists $self->{ox}) {
1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1915 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1916 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1630 : ($self->{w} - $tex->{w}) * 0.5); 1917 : ($self->{w} - $size->[0]) * 0.5);
1631 1918
1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1919 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1920 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1634 : ($self->{h} - $tex->{h}) * 0.5); 1921 : ($self->{h} - $size->[1]) * 0.5);
1635 }; 1922 };
1636 1923
1637 glEnable GL_TEXTURE_2D; 1924 my $w = List::Util::min $self->{w} + 4, $size->[0];
1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1925 my $h = List::Util::min $self->{h} + 2, $size->[1];
1639 1926
1640 glColor_premultiply @{$self->{fg}} 1927 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1641 if $tex->{format} == GL_ALPHA;
1642
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644
1645 glDisable GL_TEXTURE_2D;
1646} 1928}
1647 1929
1648############################################################################# 1930#############################################################################
1649 1931
1650package CFClient::UI::EntryBase; 1932package CFPlus::UI::EntryBase;
1651 1933
1652our @ISA = CFClient::UI::Label::; 1934our @ISA = CFPlus::UI::Label::;
1653 1935
1654use CFClient::OpenGL; 1936use CFPlus::OpenGL;
1655 1937
1656sub new { 1938sub new {
1657 my $class = shift; 1939 my $class = shift;
1658 1940
1659 $class->SUPER::new ( 1941 $class->SUPER::new (
… …
1663 active_fg => [0, 0, 0], 1945 active_fg => [0, 0, 0],
1664 can_hover => 1, 1946 can_hover => 1,
1665 can_focus => 1, 1947 can_focus => 1,
1666 valign => 0, 1948 valign => 0,
1667 can_events => 1, 1949 can_events => 1,
1950 ellipsise => 0,
1668 #text => ... 1951 #text => ...
1952 #hidden => "*",
1669 @_ 1953 @_
1670 ) 1954 )
1671} 1955}
1672 1956
1673sub _set_text { 1957sub _set_text {
… …
1680 $self->{last_activity} = $::NOW; 1964 $self->{last_activity} = $::NOW;
1681 $self->{text} = $text; 1965 $self->{text} = $text;
1682 1966
1683 $text =~ s/./*/g if $self->{hidden}; 1967 $text =~ s/./*/g if $self->{hidden};
1684 $self->{layout}->set_text ("$text "); 1968 $self->{layout}->set_text ("$text ");
1969 delete $self->{size_req};
1685 1970
1686 $self->_emit (changed => $self->{text}); 1971 $self->emit (changed => $self->{text});
1972
1973 $self->realloc;
1687 $self->update; 1974 $self->update;
1688} 1975}
1689 1976
1690sub set_text { 1977sub set_text {
1691 my ($self, $text) = @_; 1978 my ($self, $text) = @_;
1692 1979
1693 $self->{cursor} = length $text; 1980 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1981 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1982}
1698 1983
1699sub get_text { 1984sub get_text {
1700 $_[0]{text} 1985 $_[0]{text}
1701} 1986}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1991 my ($w, $h) = $self->SUPER::size_request;
1707 1992
1708 ($w + 1, $h) # add 1 for cursor 1993 ($w + 1, $h) # add 1 for cursor
1709} 1994}
1710 1995
1711sub key_down { 1996sub invoke_key_down {
1712 my ($self, $ev) = @_; 1997 my ($self, $ev) = @_;
1713 1998
1714 my $mod = $ev->{mod}; 1999 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 2000 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 2001 my $uni = $ev->{unicode};
1717 2002
1718 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;
1719 2006
1720 if ($uni == 8) { 2007 if ($uni == 8) {
1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2008 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1722 } elsif ($uni == 127) { 2009 } elsif ($uni == 127) {
1723 substr $text, $self->{cursor}, 1, ""; 2010 substr $text, $self->{cursor}, 1, "";
1724 } elsif ($sym == CFClient::SDLK_LEFT) { 2011 } elsif ($sym == CFPlus::SDLK_LEFT) {
1725 --$self->{cursor} if $self->{cursor}; 2012 --$self->{cursor} if $self->{cursor};
1726 } elsif ($sym == CFClient::SDLK_RIGHT) { 2013 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1727 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2014 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1728 } 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 = "";
1729 $self->{cursor} = 0; 2029 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 2030 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 2031 $self->emit ('escape');
1734 } elsif ($uni) { 2032 } elsif ($uni == 0x0d) {
2033 substr $text, $self->{cursor}++, 0, "\012";
2034 } elsif ($uni >= 0x20) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 2035 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 2036 } else {
1737 return 0; 2037 return 0;
1738 } 2038 }
1739 2039
1740 $self->_set_text ($text); 2040 $self->_set_text ($text);
1741 2041
1742 $self->realloc; 2042 $self->realloc;
2043 $self->update;
1743 2044
1744 1 2045 1
1745} 2046}
1746 2047
1747sub focus_in { 2048sub invoke_focus_in {
1748 my ($self) = @_; 2049 my ($self) = @_;
1749 2050
1750 $self->{last_activity} = $::NOW; 2051 $self->{last_activity} = $::NOW;
1751 2052
1752 $self->SUPER::focus_in; 2053 $self->SUPER::invoke_focus_in
1753} 2054}
1754 2055
1755sub button_down { 2056sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1757 2058
1758 $self->SUPER::button_down ($ev, $x, $y); 2059 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 2060
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 2061 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 2062
1762 # byte-index to char-index 2063 # byte-index to char-index
1763 my $text = $self->{text}; 2064 my $text = $self->{text};
1764 utf8::encode $text; 2065 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 2066 $self->{cursor} = length $text;
1766 2067
1767 $self->_set_text ($self->{text}); 2068 $self->_set_text ($self->{text});
1768 $self->update; 2069 $self->update;
1769 2070
1770 1 2071 1
1771} 2072}
1772 2073
1773sub mouse_motion { 2074sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 2075 my ($self, $ev, $x, $y) = @_;
1775# 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#
1776 2077
1777 0 2078 1
1778} 2079}
1779 2080
1780sub _draw { 2081sub _draw {
1781 my ($self) = @_; 2082 my ($self) = @_;
1782 2083
… …
1809 utf8::encode $text; 2110 utf8::encode $text;
1810 2111
1811 @$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)
1812 } 2113 }
1813 2114
1814 glColor @{$self->{fg}};
1815 glBegin GL_LINES; 2115 glBegin GL_LINES;
1816 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};
1817 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};
1818 glEnd; 2118 glEnd;
1819 } 2119 }
1820} 2120}
1821 2121
2122#############################################################################
2123
1822package CFClient::UI::Entry; 2124package CFPlus::UI::Entry;
1823 2125
1824our @ISA = CFClient::UI::EntryBase::; 2126our @ISA = CFPlus::UI::EntryBase::;
1825 2127
1826use CFClient::OpenGL; 2128use CFPlus::OpenGL;
1827 2129
1828sub key_down { 2130sub invoke_key_down {
1829 my ($self, $ev) = @_; 2131 my ($self, $ev) = @_;
1830 2132
1831 my $sym = $ev->{sym}; 2133 my $sym = $ev->{sym};
1832 2134
1833 if ($sym == 13) { 2135 if ($ev->{uni} == 0x0d || $sym == 13) {
1834 unshift @{$self->{history}}, 2136 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 2137 my $txt = $self->get_text;
2138
1836 $self->{history_pointer} = -1; 2139 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 2140 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 2141 $self->emit (activate => $txt);
1839 $self->update; 2142 $self->update;
1840 2143
1841 } elsif ($sym == CFClient::SDLK_UP) { 2144 } elsif ($sym == CFPlus::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 2145 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 2146 $self->{history_saveback} = $self->get_text;
1844 } 2147 }
1845 if (@{$self->{history} || []} > 0) { 2148 if (@{$self->{history} || []} > 0) {
1846 $self->{history_pointer}++; 2149 $self->{history_pointer}++;
… …
1848 $self->{history_pointer} = @{$self->{history} || []} - 1; 2151 $self->{history_pointer} = @{$self->{history} || []} - 1;
1849 } 2152 }
1850 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2153 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1851 } 2154 }
1852 2155
1853 } elsif ($sym == CFClient::SDLK_DOWN) { 2156 } elsif ($sym == CFPlus::SDLK_DOWN) {
1854 $self->{history_pointer}--; 2157 $self->{history_pointer}--;
1855 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2158 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1856 2159
1857 if ($self->{history_pointer} >= 0) { 2160 if ($self->{history_pointer} >= 0) {
1858 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2161 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1859 } else { 2162 } else {
1860 $self->set_text ($self->{history_saveback}); 2163 $self->set_text ($self->{history_saveback});
1861 } 2164 }
1862 2165
1863 } else { 2166 } else {
1864 return $self->SUPER::key_down ($ev) 2167 return $self->SUPER::invoke_key_down ($ev)
1865 } 2168 }
1866 2169
1867 1 2170 1
1868} 2171}
1869 2172
1870############################################################################# 2173#############################################################################
1871 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
1872package CFClient::UI::Button; 2214package CFPlus::UI::Button;
1873 2215
1874our @ISA = CFClient::UI::Label::; 2216our @ISA = CFPlus::UI::Label::;
1875 2217
1876use CFClient::OpenGL; 2218use CFPlus::OpenGL;
1877 2219
1878my @tex = 2220my @tex =
1879 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2221 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1880 qw(b1_button_active.png); 2222 qw(b1_button_active.png);
1881 2223
1882sub new { 2224sub new {
1883 my $class = shift; 2225 my $class = shift;
1884 2226
… …
1893 can_events => 1, 2235 can_events => 1,
1894 @_ 2236 @_
1895 ) 2237 )
1896} 2238}
1897 2239
1898sub activate { }
1899
1900sub button_up { 2240sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
1902 2242
1903 $self->emit ("activate") 2243 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2244 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2245 && $y >= 0 && $y < $self->{h};
… …
1923 $self->SUPER::_draw; 2263 $self->SUPER::_draw;
1924} 2264}
1925 2265
1926############################################################################# 2266#############################################################################
1927 2267
1928package CFClient::UI::CheckBox; 2268package CFPlus::UI::CheckBox;
1929 2269
1930our @ISA = CFClient::UI::DrawBG::; 2270our @ISA = CFPlus::UI::DrawBG::;
1931 2271
1932my @tex = 2272my @tex =
1933 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1934 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2274 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1935 2275
1936use CFClient::OpenGL; 2276use CFPlus::OpenGL;
1937 2277
1938sub new { 2278sub new {
1939 my $class = shift; 2279 my $class = shift;
1940 2280
1941 $class->SUPER::new ( 2281 $class->SUPER::new (
… …
1955 my ($self) = @_; 2295 my ($self) = @_;
1956 2296
1957 (6) x 2 2297 (6) x 2
1958} 2298}
1959 2299
2300sub toggle {
2301 my ($self) = @_;
2302
2303 $self->{state} = !$self->{state};
2304 $self->emit (changed => $self->{state});
2305 $self->update;
2306}
2307
1960sub button_down { 2308sub invoke_button_down {
1961 my ($self, $ev, $x, $y) = @_; 2309 my ($self, $ev, $x, $y) = @_;
1962 2310
1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2311 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2312 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1965 $self->{state} = !$self->{state}; 2313 $self->toggle;
1966 $self->_emit (changed => $self->{state});
1967 } else { 2314 } else {
1968 return 0 2315 return 0
1969 } 2316 }
1970 2317
1971 1 2318 1
… …
1991 glDisable GL_TEXTURE_2D; 2338 glDisable GL_TEXTURE_2D;
1992} 2339}
1993 2340
1994############################################################################# 2341#############################################################################
1995 2342
1996package CFClient::UI::Image; 2343package CFPlus::UI::Image;
1997 2344
1998our @ISA = CFClient::UI::Base::; 2345our @ISA = CFPlus::UI::Base::;
1999 2346
2000use CFClient::OpenGL; 2347use CFPlus::OpenGL;
2001use Carp qw/confess/;
2002 2348
2003our %loaded_images; 2349our %texture_cache;
2004 2350
2005sub new { 2351sub new {
2006 my $class = shift; 2352 my $class = shift;
2007 2353
2008 my $self = $class->SUPER::new (can_events => 0, @_); 2354 my $self = $class->SUPER::new (
2355 can_events => 0,
2356 @_,
2357 );
2009 2358
2010 $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";
2011 2361
2012 $loaded_images{$self->{image}} ||= 2362 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2013 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;
2014 2364
2015 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2365 CFPlus::weaken $texture_cache{$self->{path}};
2016 2366
2017 Scalar::Util::weaken $loaded_images{$self->{image}}; 2367 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2018
2019 $self->{aspect} = $tex->{w} / $tex->{h};
2020 2368
2021 $self 2369 $self
2022} 2370}
2023 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
2024sub size_request { 2387sub size_request {
2025 my ($self) = @_; 2388 my ($self) = @_;
2026 2389
2027 ($self->{tex}->{w}, $self->{tex}->{h}) 2390 ($self->{tex}{w}, $self->{tex}{h})
2028} 2391}
2029 2392
2030sub _draw { 2393sub _draw {
2031 my ($self) = @_; 2394 my ($self) = @_;
2032 2395
… …
2042 } 2405 }
2043 2406
2044 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2045 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2046 2409
2047 $tex->draw_quad_alpha (0, 0, $w, $h); 2410 $tex->draw_quad (0, 0, $w, $h);
2048 2411
2049 glDisable GL_TEXTURE_2D; 2412 glDisable GL_TEXTURE_2D;
2050} 2413}
2051 2414
2052############################################################################# 2415#############################################################################
2053 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
2054package CFClient::UI::VGauge; 2453package CFPlus::UI::VGauge;
2055 2454
2056our @ISA = CFClient::UI::Base::; 2455our @ISA = CFPlus::UI::Base::;
2057 2456
2058use List::Util qw(min max); 2457use List::Util qw(min max);
2059 2458
2060use CFClient::OpenGL; 2459use CFPlus::OpenGL;
2061 2460
2062my %tex = ( 2461my %tex = (
2063 food => [ 2462 food => [
2064 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2463 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2065 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2464 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2066 ], 2465 ],
2067 grace => [ 2466 grace => [
2068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2467 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2069 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/
2070 ], 2469 ],
2071 hp => [ 2470 hp => [
2072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2471 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2073 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2472 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2074 ], 2473 ],
2075 mana => [ 2474 mana => [
2076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2475 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2077 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/
2078 ], 2477 ],
2079); 2478);
2080 2479
2081# eg. VGauge->new (gauge => 'food'), default gauge: food 2480# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2141 my $ycut1 = max 0, min 1, $ycut; 2540 my $ycut1 = max 0, min 1, $ycut;
2142 my $ycut2 = max 0, min 1, $ycut - 1; 2541 my $ycut2 = max 0, min 1, $ycut - 1;
2143 2542
2144 my $h1 = $self->{h} * (1 - $ycut1); 2543 my $h1 = $self->{h} * (1 - $ycut1);
2145 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);
2146 2548
2147 glEnable GL_BLEND; 2549 glEnable GL_BLEND;
2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2550 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2551 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2150 glEnable GL_TEXTURE_2D; 2552 glEnable GL_TEXTURE_2D;
… …
2169 2571
2170 if ($t3) { 2572 if ($t3) {
2171 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2573 glBindTexture GL_TEXTURE_2D, $t3->{name};
2172 glBegin GL_QUADS; 2574 glBegin GL_QUADS;
2173 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2575 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2174 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2576 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2175 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2577 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2176 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2578 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2177 glEnd; 2579 glEnd;
2178 } 2580 }
2179 2581
2180 glDisable GL_BLEND; 2582 glDisable GL_BLEND;
2181 glDisable GL_TEXTURE_2D; 2583 glDisable GL_TEXTURE_2D;
2182} 2584}
2183 2585
2184############################################################################# 2586#############################################################################
2185 2587
2186package CFClient::UI::Gauge; 2588package CFPlus::UI::Gauge;
2187 2589
2188our @ISA = CFClient::UI::VBox::; 2590our @ISA = CFPlus::UI::VBox::;
2189 2591
2190sub new { 2592sub new {
2191 my ($class, %arg) = @_; 2593 my ($class, %arg) = @_;
2192 2594
2193 my $self = $class->SUPER::new ( 2595 my $self = $class->SUPER::new (
… …
2195 can_hover => 1, 2597 can_hover => 1,
2196 can_events => 1, 2598 can_events => 1,
2197 %arg, 2599 %arg,
2198 ); 2600 );
2199 2601
2200 $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");
2201 $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);
2202 $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");
2203 2605
2204 $self 2606 $self
2205} 2607}
2206 2608
2207sub set_fontsize { 2609sub set_fontsize {
… …
2228 $self->{value}->set_text ($val); 2630 $self->{value}->set_text ($val);
2229} 2631}
2230 2632
2231############################################################################# 2633#############################################################################
2232 2634
2233package CFClient::UI::Slider; 2635package CFPlus::UI::Slider;
2234 2636
2235use strict; 2637use strict;
2236 2638
2237use CFClient::OpenGL; 2639use CFPlus::OpenGL;
2238 2640
2239our @ISA = CFClient::UI::DrawBG::; 2641our @ISA = CFPlus::UI::DrawBG::;
2240 2642
2241my @tex = 2643my @tex =
2242 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2644 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2243 qw(s1_slider.png s1_slider_bg.png); 2645 qw(s1_slider.png s1_slider_bg.png);
2244 2646
2245sub new { 2647sub new {
2246 my $class = shift; 2648 my $class = shift;
2247 2649
… …
2268 $self->update; 2670 $self->update;
2269 2671
2270 $self 2672 $self
2271} 2673}
2272 2674
2273sub changed { }
2274
2275sub set_range { 2675sub set_range {
2276 my ($self, $range) = @_; 2676 my ($self, $range) = @_;
2277 2677
2278 ($range, $self->{range}) = ($self->{range}, $range); 2678 ($range, $self->{range}) = ($self->{range}, $range);
2279 2679
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}"; 2680 if ("@$range" ne "@{$self->{range}}") {
2681 $self->update;
2682 $self->set_value ($self->{range}[0]);
2683 }
2282} 2684}
2283 2685
2284sub set_value { 2686sub set_value {
2285 my ($self, $value) = @_; 2687 my ($self, $value) = @_;
2286 2688
… …
2297 if $unit; 2699 if $unit;
2298 2700
2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2701 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2300 2702
2301 if ($value != $old_value) { 2703 if ($value != $old_value) {
2302 $self->_emit (changed => $value); 2704 $self->emit (changed => $value);
2303 $self->update; 2705 $self->update;
2304 } 2706 }
2305} 2707}
2306 2708
2307sub size_request { 2709sub size_request {
2308 my ($self) = @_; 2710 my ($self) = @_;
2309 2711
2310 ($self->{req_w}, $self->{req_h}) 2712 ($self->{req_w}, $self->{req_h})
2311} 2713}
2312 2714
2313sub button_down { 2715sub invoke_button_down {
2314 my ($self, $ev, $x, $y) = @_; 2716 my ($self, $ev, $x, $y) = @_;
2315 2717
2316 $self->SUPER::button_down ($ev, $x, $y); 2718 $self->SUPER::invoke_button_down ($ev, $x, $y);
2317 2719
2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2720 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319 2721
2320 $self->mouse_motion ($ev, $x, $y) 2722 $self->invoke_mouse_motion ($ev, $x, $y)
2321} 2723}
2322 2724
2323sub mouse_motion { 2725sub invoke_mouse_motion {
2324 my ($self, $ev, $x, $y) = @_; 2726 my ($self, $ev, $x, $y) = @_;
2325 2727
2326 if ($GRAB == $self) { 2728 if ($GRAB == $self) {
2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2729 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2328 2730
… …
2334 } else { 2736 } else {
2335 return 0; 2737 return 0;
2336 } 2738 }
2337 2739
2338 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
2339} 2753}
2340 2754
2341sub update { 2755sub update {
2342 my ($self) = @_; 2756 my ($self) = @_;
2343 2757
… …
2392 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2393} 2807}
2394 2808
2395############################################################################# 2809#############################################################################
2396 2810
2397package CFClient::UI::ValSlider; 2811package CFPlus::UI::ValSlider;
2398 2812
2399our @ISA = CFClient::UI::HBox::; 2813our @ISA = CFPlus::UI::HBox::;
2400 2814
2401sub new { 2815sub new {
2402 my ($class, %arg) = @_; 2816 my ($class, %arg) = @_;
2403 2817
2404 my $range = delete $arg{range}; 2818 my $range = delete $arg{range};
2405 2819
2406 my $self = $class->SUPER::new ( 2820 my $self = $class->SUPER::new (
2407 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2821 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2408 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2822 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2409 to_value => sub { shift }, 2823 to_value => sub { shift },
2410 from_value => sub { shift }, 2824 from_value => sub { shift },
2411 %arg, 2825 %arg,
2412 ); 2826 );
2413 2827
… …
2433sub set_range { shift->{slider}->set_range (@_) } 2847sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) } 2848sub set_value { shift->{slider}->set_value (@_) }
2435 2849
2436############################################################################# 2850#############################################################################
2437 2851
2438package CFClient::UI::TextView; 2852package CFPlus::UI::TextScroller;
2439 2853
2440our @ISA = CFClient::UI::HBox::; 2854our @ISA = CFPlus::UI::HBox::;
2441 2855
2442use CFClient::OpenGL; 2856use CFPlus::OpenGL;
2443 2857
2444sub new { 2858sub new {
2445 my $class = shift; 2859 my $class = shift;
2446 2860
2447 my $self = $class->SUPER::new ( 2861 my $self = $class->SUPER::new (
2448 fontsize => 1, 2862 fontsize => 1,
2449 can_events => 0, 2863 can_events => 1,
2864 indent => 0,
2450 #font => default_font 2865 #font => default_font
2451 @_, 2866 @_,
2452 2867
2453 layout => (new CFClient::Layout 1), 2868 layout => (new CFPlus::Layout),
2454 par => [], 2869 par => [],
2870 max_par => 0,
2455 height => 0, 2871 height => 0,
2456 children => [ 2872 children => [
2457 (new CFClient::UI::Empty expand => 1), 2873 (new CFPlus::UI::Empty expand => 1),
2458 (new CFClient::UI::Slider vertical => 1), 2874 (new CFPlus::UI::Slider vertical => 1),
2459 ], 2875 ],
2460 ); 2876 );
2461 2877
2462 $self->{children}[1]->connect (changed => sub { $self->update }); 2878 $self->{children}[1]->connect (changed => sub { $self->update });
2463 2879
… …
2469 2885
2470 $self->{fontsize} = $fontsize; 2886 $self->{fontsize} = $fontsize;
2471 $self->reflow; 2887 $self->reflow;
2472} 2888}
2473 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
2474sub size_allocate { 2899sub invoke_size_allocate {
2475 my ($self, $w, $h) = @_; 2900 my ($self, $w, $h) = @_;
2476 2901
2477 $self->SUPER::size_allocate ($w, $h); 2902 my ($empty, $slider, @other) = @{ $self->{children} };
2903 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2478 2904
2479 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2905 $self->{layout}->set_font ($self->{font}) if $self->{font};
2480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2906 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2481 $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});
2482 2909
2483 $self->reflow; 2910 $self->reflow;
2484}
2485 2911
2486sub text_size { 2912 local $self->{children} = [$empty, $slider];
2913 $self->SUPER::invoke_size_allocate ($w, $h)
2914}
2915
2916sub invoke_mouse_wheel {
2487 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) = @_;
2488 2928
2489 my $layout = $self->{layout}; 2929 my $layout = $self->{layout};
2490 2930
2931 $layout->set_font ($self->{font}) if $self->{font};
2932 $layout->set_foreground (@{$para->{fg}});
2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2933 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492 $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});
2493 $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}}
2494 2942 );
2943
2495 $layout->size 2944 $layout
2496} 2945}
2497 2946
2498sub reflow { 2947sub reflow {
2499 my ($self) = @_; 2948 my ($self) = @_;
2500 2949
… …
2507 2956
2508 # todo: base offset on lines or so, not on pixels 2957 # todo: base offset on lines or so, not on pixels
2509 $self->{children}[1]->set_value ($offset); 2958 $self->{children}[1]->set_value ($offset);
2510} 2959}
2511 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
2512sub clear { 2976sub clear {
2513 my ($self) = @_; 2977 my ($self) = @_;
2978
2979 my (undef, undef, @other) = @{ $self->{children} };
2980 $self->remove ($_) for @other;
2514 2981
2515 $self->{par} = []; 2982 $self->{par} = [];
2516 $self->{height} = 0; 2983 $self->{height} = 0;
2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2984 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2518} 2985}
2519 2986
2520sub add_paragraph { 2987sub add_paragraph {
2521 my ($self, $color, $text, $indent) = @_; 2988 my $self = shift;
2522 2989
2523 for my $line (split /\n/, $text) { 2990 for my $para (@_) {
2524 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
2525 $self->{height} += $h; 3042 $self->{height} = $height;
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3043 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2527 }
2528 3044
2529 $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 }
2530} 3051}
2531 3052
2532sub update { 3053sub update {
2533 my ($self) = @_; 3054 my ($self) = @_;
2534 3055
… …
2536 3057
2537 return unless $self->{h} > 0; 3058 return unless $self->{h} > 0;
2538 3059
2539 delete $self->{texture}; 3060 delete $self->{texture};
2540 3061
2541 $ROOT->on_post_alloc ($self, sub { 3062 $ROOT->on_post_alloc ($self => sub {
3063 $self->force_uptodate;
3064
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3065 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543 3066
2544 if (delete $self->{need_reflow}) {
2545 my $height = 0;
2546
2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2551 for (@{$self->{par}}) {
2552 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2553 $layout->set_width ($W - $_->[3]);
2554 $layout->set_markup ($_->[4]);
2555 my ($w, $h) = $layout->size;
2556 $_->[0] = $w + $_->[3];
2557 $_->[1] = $h;
2558 }
2559
2560 $height += $_->[1];
2561 }
2562
2563 $self->{height} = $height;
2564
2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2566
2567 delete $self->{texture};
2568 }
2569
2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3067 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2571 glClearColor 0, 0, 0, 0; 3068 glClearColor 0, 0, 0, 0;
2572 glClear GL_COLOR_BUFFER_BIT; 3069 glClear GL_COLOR_BUFFER_BIT;
2573 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;
2574 my $top = int $self->{children}[1]{range}[0]; 3079 my $top = int $self->{children}[1]{range}[0];
2575 3080
2576 my $y0 = $top; 3081 my $y0 = $top;
2577 my $y1 = $top + $H; 3082 my $y1 = $top + $H;
2578 3083
2579 my $y = 0;
2580
2581 my $layout = $self->{layout};
2582
2583 $layout->set_font ($self->{font}) if $self->{font};
2584
2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2588
2589 for my $par (@{$self->{par}}) { 3084 for my $para (@{$self->{par}}) {
2590 my $h = $par->[1]; 3085 my $h = $para->{h};
3086 my $y = $para->{y};
2591 3087
2592 if ($y0 < $y + $h && $y < $y1) { 3088 if ($y0 < $y + $h && $y < $y1) {
2593 $layout->set_foreground (@{ $par->[2] }); 3089 my $layout = $self->get_layout ($para);
2594 $layout->set_width ($W - $par->[3]);
2595 $layout->set_markup ($par->[4]);
2596 3090
2597 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3091 $layout->render ($para->{indent}, $y - $y0);
2598 3092
2599 glRasterPos $par->[3], $y - $y0; 3093 if (my @w = @{ $para->{widget} }) {
2600 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 }
2601 } 3105 }
2602 3106
2603 $y += $h; 3107 $paridx++;
3108 $top_paragraph ||= $paridx if $y >= $top;
2604 } 3109 }
2605 3110
2606 glDisable GL_BLEND; 3111 $self->{top_paragraph} = $top_paragraph;
2607 }; 3112 };
2608 }); 3113 });
3114}
3115
3116sub reconfigure {
3117 my ($self) = @_;
3118
3119 $self->SUPER::reconfigure;
3120
3121 $_->{w} = 1e10 for @{ $self->{par} };
3122 $self->reflow;
2609} 3123}
2610 3124
2611sub _draw { 3125sub _draw {
2612 my ($self) = @_; 3126 my ($self) = @_;
2613 3127
… …
2616 glColor 0, 0, 0, 1; 3130 glColor 0, 0, 0, 1;
2617 $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});
2618 glDisable GL_TEXTURE_2D; 3132 glDisable GL_TEXTURE_2D;
2619 3133
2620 $self->{children}[1]->draw; 3134 $self->{children}[1]->draw;
2621
2622} 3135}
2623 3136
2624############################################################################# 3137#############################################################################
2625 3138
2626package CFClient::UI::Animator; 3139package CFPlus::UI::Animator;
2627 3140
2628use CFClient::OpenGL; 3141use CFPlus::OpenGL;
2629 3142
2630our @ISA = CFClient::UI::Bin::; 3143our @ISA = CFPlus::UI::Bin::;
2631 3144
2632sub moveto { 3145sub moveto {
2633 my ($self, $x, $y) = @_; 3146 my ($self, $x, $y) = @_;
2634 3147
2635 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3148 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2663 glPopMatrix; 3176 glPopMatrix;
2664} 3177}
2665 3178
2666############################################################################# 3179#############################################################################
2667 3180
2668package CFClient::UI::Flopper; 3181package CFPlus::UI::Flopper;
2669 3182
2670our @ISA = CFClient::UI::Button::; 3183our @ISA = CFPlus::UI::Button::;
2671 3184
2672sub new { 3185sub new {
2673 my $class = shift; 3186 my $class = shift;
2674 3187
2675 my $self = $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
… …
2687 $self->{other}->toggle_visibility; 3200 $self->{other}->toggle_visibility;
2688} 3201}
2689 3202
2690############################################################################# 3203#############################################################################
2691 3204
2692package CFClient::UI::Tooltip; 3205package CFPlus::UI::Tooltip;
2693 3206
2694our @ISA = CFClient::UI::Bin::; 3207our @ISA = CFPlus::UI::Bin::;
2695 3208
2696use CFClient::OpenGL; 3209use CFPlus::OpenGL;
2697 3210
2698sub new { 3211sub new {
2699 my $class = shift; 3212 my $class = shift;
2700 3213
2701 $class->SUPER::new ( 3214 $class->SUPER::new (
… …
2704 ) 3217 )
2705} 3218}
2706 3219
2707sub set_tooltip_from { 3220sub set_tooltip_from {
2708 my ($self, $widget) = @_; 3221 my ($self, $widget) = @_;
3222
3223 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3224 if $widget->{tooltip} =~ /^#(.*)$/;
2709 3225
2710 my $tooltip = $widget->{tooltip}; 3226 my $tooltip = $widget->{tooltip};
2711 3227
2712 if ($ENV{CFPLUS_DEBUG} & 2) { 3228 if ($ENV{CFPLUS_DEBUG} & 2) {
2713 $tooltip .= "\n\n" . (ref $widget) . "\n" 3229 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3230 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n" 3231 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}"; 3232 . "visible $widget->{visible}";
2717 } 3233 }
2718 3234
3235 $tooltip =~ s/^\n+//;
3236 $tooltip =~ s/\n+$//;
3237
2719 $self->add (new CFClient::UI::Label 3238 $self->add (new CFPlus::UI::Label
2720 markup => $tooltip, 3239 markup => $tooltip,
2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3240 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2722 fontsize => 0.8, 3241 fontsize => 0.8,
2723 fg => [0, 0, 0, 1], 3242 style => 1, # FLAG_INVERSE
2724 ellipsise => 0, 3243 ellipsise => 0,
2725 font => ($widget->{tooltip_font} || $::FONT_PROP), 3244 font => ($widget->{tooltip_font} || $::FONT_PROP),
2726 ); 3245 );
2727} 3246}
2728 3247
… …
2732 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3251 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2733 3252
2734 ($w + 4, $h + 4) 3253 ($w + 4, $h + 4)
2735} 3254}
2736 3255
2737sub size_allocate { 3256sub invoke_size_allocate {
2738 my ($self, $w, $h) = @_; 3257 my ($self, $w, $h) = @_;
2739 3258
2740 $self->SUPER::size_allocate ($w - 4, $h - 4); 3259 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2741} 3260}
2742 3261
2743sub visibility_change { 3262sub invoke_visibility_change {
2744 my ($self, $visible) = @_; 3263 my ($self, $visible) = @_;
2745 3264
2746 return unless $visible; 3265 return unless $visible;
2747 3266
2748 $self->{root}->on_post_alloc ("move_$self" => sub { 3267 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner} 3268 my $widget = $self->{owner}
2750 or return; 3269 or return;
2751 3270
3271 if ($widget->{visible}) {
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3272 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753 3273
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3274 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH; 3275 if $x + $self->{w} > $self->{root}{w};
2756 3276
2757 $self->move_abs ($x, $y); 3277 $self->move_abs ($x, $y);
3278 } else {
3279 $self->hide;
3280 }
2758 }); 3281 });
2759} 3282}
2760 3283
2761sub _draw { 3284sub _draw {
2762 my ($self) = @_; 3285 my ($self) = @_;
… …
2786 $self->SUPER::_draw; 3309 $self->SUPER::_draw;
2787} 3310}
2788 3311
2789############################################################################# 3312#############################################################################
2790 3313
2791package CFClient::UI::Face; 3314package CFPlus::UI::Face;
2792 3315
2793our @ISA = CFClient::UI::Base::; 3316our @ISA = CFPlus::UI::DrawBG::;
2794 3317
2795use CFClient::OpenGL; 3318use CFPlus::OpenGL;
2796 3319
2797sub new { 3320sub new {
2798 my $class = shift; 3321 my $class = shift;
2799 3322
2800 my $self = $class->SUPER::new ( 3323 my $self = $class->SUPER::new (
… …
2802 can_events => 0, 3325 can_events => 0,
2803 @_, 3326 @_,
2804 ); 3327 );
2805 3328
2806 if ($self->{anim} && $self->{animspeed}) { 3329 if ($self->{anim} && $self->{animspeed}) {
2807 Scalar::Util::weaken (my $widget = $self); 3330 CFPlus::weaken (my $widget = $self);
2808 3331
2809 $self->{timer} = Event->timer ( 3332 $self->{timer} = Event->timer (
2810 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3333 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2811 hard => 1, 3334 hard => 1,
2812 interval => $self->{animspeed}, 3335 interval => $self->{animspeed},
… …
2835sub _draw { 3358sub _draw {
2836 my ($self) = @_; 3359 my ($self) = @_;
2837 3360
2838 return unless $::CONN; 3361 return unless $::CONN;
2839 3362
3363 $self->SUPER::_draw;
3364
2840 my $face; 3365 my $face;
2841 3366
2842 if ($self->{frame}) { 3367 if ($self->{frame}) {
2843 my $anim = $::CONN->{anim}[$self->{anim}]; 3368 my $anim = $::CONN->{anim}[$self->{anim}];
2844 3369
… …
2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3380 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2856 glDisable GL_TEXTURE_2D; 3381 glDisable GL_TEXTURE_2D;
2857 } 3382 }
2858} 3383}
2859 3384
2860sub DESTROY { 3385sub destroy {
2861 my ($self) = @_; 3386 my ($self) = @_;
2862 3387
2863 $self->{timer}->cancel 3388 $self->{timer}->cancel
2864 if $self->{timer}; 3389 if $self->{timer};
2865 3390
2866 $self->SUPER::DESTROY; 3391 $self->SUPER::destroy;
2867} 3392}
2868 3393
2869############################################################################# 3394#############################################################################
2870 3395
2871package CFClient::UI::Buttonbar; 3396package CFPlus::UI::Buttonbar;
2872 3397
2873our @ISA = CFClient::UI::HBox::; 3398our @ISA = CFPlus::UI::HBox::;
2874 3399
2875# TODO: should actualyl wrap buttons and other goodies. 3400# TODO: should actually wrap buttons and other goodies.
2876 3401
2877############################################################################# 3402#############################################################################
2878 3403
2879package CFClient::UI::Menu; 3404package CFPlus::UI::Menu;
2880 3405
2881our @ISA = CFClient::UI::FancyFrame::; 3406our @ISA = CFPlus::UI::Toplevel::;
2882 3407
2883use CFClient::OpenGL; 3408use CFPlus::OpenGL;
2884 3409
2885sub new { 3410sub new {
2886 my $class = shift; 3411 my $class = shift;
2887 3412
2888 my $self = $class->SUPER::new ( 3413 my $self = $class->SUPER::new (
2889 items => [], 3414 items => [],
2890 z => 100, 3415 z => 100,
2891 @_, 3416 @_,
2892 ); 3417 );
2893 3418
2894 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3419 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2895 3420
2896 for my $item (@{ $self->{items} }) { 3421 for my $item (@{ $self->{items} }) {
2897 my ($widget, $cb) = @$item; 3422 my ($widget, $cb, $tooltip) = @$item;
2898 3423
2899 # handle various types of items, only text for now 3424 # handle various types of items, only text for now
2900 if (!ref $widget) { 3425 if (!ref $widget) {
3426 if ($widget =~ /\t/) {
3427 my ($left, $right) = split /\t/, $widget, 2;
3428
2901 $widget = new CFClient::UI::Label 3429 $widget = new CFPlus::UI::HBox
2902 can_hover => 1, 3430 can_hover => 1,
2903 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,
2904 text => $widget; 3443 markup => $widget,
3444 tooltip => $tooltip;
3445 }
2905 } 3446 }
2906 3447
2907 $self->{item}{$widget} = $item; 3448 $self->{item}{$widget} = $item;
2908 3449
2909 $self->{vbox}->add ($widget); 3450 $self->{vbox}->add ($widget);
… …
2914 3455
2915# 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)
2916sub popup { 3457sub popup {
2917 my ($self, $ev) = @_; 3458 my ($self, $ev) = @_;
2918 3459
2919 $self->_emit ("popdown"); 3460 $self->emit ("popdown");
2920 3461
2921 # maybe save $GRAB? must be careful about events... 3462 # maybe save $GRAB? must be careful about events...
2922 $GRAB = $self; 3463 $GRAB = $self;
2923 $self->{button} = $ev->{button}; 3464 $self->{button} = $ev->{button};
2924 3465
2925 $self->show; 3466 $self->show;
2926 $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);
2927} 3468}
2928 3469
2929sub mouse_motion { 3470sub invoke_mouse_motion {
2930 my ($self, $ev, $x, $y) = @_; 3471 my ($self, $ev, $x, $y) = @_;
2931 3472
2932 # TODO: should use vbox->find_widget or so 3473 # TODO: should use vbox->find_widget or so
2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3474 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2934 $self->{hover} = $self->{item}{$HOVER}; 3475 $self->{hover} = $self->{item}{$HOVER};
2935 3476
2936 0 3477 0
2937} 3478}
2938 3479
2939sub button_up { 3480sub invoke_button_up {
2940 my ($self, $ev, $x, $y) = @_; 3481 my ($self, $ev, $x, $y) = @_;
2941 3482
2942 if ($ev->{button} == $self->{button}) { 3483 if ($ev->{button} == $self->{button}) {
2943 undef $GRAB; 3484 undef $GRAB;
2944 $self->hide; 3485 $self->hide;
2945 3486
2946 $self->_emit ("popdown"); 3487 $self->emit ("popdown");
2947 $self->{hover}[1]->() if $self->{hover}; 3488 $self->{hover}[1]->() if $self->{hover};
2948 } else { 3489 } else {
2949 return 0 3490 return 0
2950 } 3491 }
2951 3492
2952 1 3493 1
2953} 3494}
2954 3495
2955############################################################################# 3496#############################################################################
2956 3497
2957package CFClient::UI::Multiplexer; 3498package CFPlus::UI::Multiplexer;
2958 3499
2959our @ISA = CFClient::UI::Container::; 3500our @ISA = CFPlus::UI::Container::;
2960 3501
2961sub new { 3502sub new {
2962 my $class = shift; 3503 my $class = shift;
2963 3504
2964 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
… …
2978 3519
2979 $self->{current} = $self->{children}[0] 3520 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} }; 3521 if @{ $self->{children} };
2981} 3522}
2982 3523
3524sub get_current_page {
3525 my ($self) = @_;
3526
3527 $self->{current}
3528}
3529
2983sub set_current_page { 3530sub set_current_page {
2984 my ($self, $page_or_widget) = @_; 3531 my ($self, $page_or_widget) = @_;
2985 3532
2986 my $widget = ref $page_or_widget 3533 my $widget = ref $page_or_widget
2987 ? $page_or_widget 3534 ? $page_or_widget
2988 : $self->{children}[$page_or_widget]; 3535 : $self->{children}[$page_or_widget];
2989 3536
2990 $self->{current} = $widget; 3537 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3538 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992 3539
2993 $self->_emit (page_changed => $self->{current}); 3540 $self->emit (page_changed => $self->{current});
2994 3541
2995 $self->realloc; 3542 $self->realloc;
2996} 3543}
2997 3544
2998sub visible_children { 3545sub visible_children {
… …
3003 my ($self) = @_; 3550 my ($self) = @_;
3004 3551
3005 $self->{current}->size_request 3552 $self->{current}->size_request
3006} 3553}
3007 3554
3008sub size_allocate { 3555sub invoke_size_allocate {
3009 my ($self, $w, $h) = @_; 3556 my ($self, $w, $h) = @_;
3010 3557
3011 $self->{current}->configure (0, 0, $w, $h); 3558 $self->{current}->configure (0, 0, $w, $h);
3559
3560 1
3012} 3561}
3013 3562
3014sub _draw { 3563sub _draw {
3015 my ($self) = @_; 3564 my ($self) = @_;
3016 3565
3017 $self->{current}->draw; 3566 $self->{current}->draw;
3018} 3567}
3019 3568
3020############################################################################# 3569#############################################################################
3021 3570
3022package CFClient::UI::Notebook; 3571package CFPlus::UI::Notebook;
3023 3572
3024our @ISA = CFClient::UI::VBox::; 3573our @ISA = CFPlus::UI::VBox::;
3025 3574
3026sub new { 3575sub new {
3027 my $class = shift; 3576 my $class = shift;
3028 3577
3029 my $self = $class->SUPER::new ( 3578 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar), 3579 buttonbar => (new CFPlus::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3580 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3032 # filter => # will be put between multiplexer and $self 3581 # filter => # will be put between multiplexer and $self
3033 @_, 3582 @_,
3034 ); 3583 );
3035 3584
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3585 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3040} 3589}
3041 3590
3042sub add { 3591sub add {
3043 my ($self, $title, $widget, $tooltip) = @_; 3592 my ($self, $title, $widget, $tooltip) = @_;
3044 3593
3045 Scalar::Util::weaken $self; 3594 CFPlus::weaken $self;
3046 3595
3047 $self->{buttonbar}->add (new CFClient::UI::Button 3596 $self->{buttonbar}->add (new CFPlus::UI::Button
3048 markup => $title, 3597 markup => $title,
3049 tooltip => $tooltip, 3598 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) }, 3599 on_activate => sub { $self->set_current_page ($widget) },
3051 ); 3600 );
3052 3601
3053 $self->{multiplexer}->add ($widget); 3602 $self->{multiplexer}->add ($widget);
3054} 3603}
3055 3604
3605sub get_current_page {
3606 my ($self) = @_;
3607
3608 $self->{multiplexer}->get_current_page
3609}
3610
3056sub set_current_page { 3611sub set_current_page {
3057 my ($self, $page) = @_; 3612 my ($self, $page) = @_;
3058 3613
3059 $self->{multiplexer}->set_current_page ($page); 3614 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current}); 3615 $self->emit (page_changed => $self->{multiplexer}{current});
3061} 3616}
3062 3617
3063############################################################################# 3618#############################################################################
3064 3619
3065package CFClient::UI::Statusbox; 3620package CFPlus::UI::Selector;
3066 3621
3622use utf8;
3623
3067our @ISA = CFClient::UI::VBox::; 3624our @ISA = CFPlus::UI::Button::;
3068 3625
3069sub new { 3626sub new {
3070 my $class = shift; 3627 my $class = shift;
3071 3628
3072 $class->SUPER::new ( 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
3676package CFPlus::UI::Statusbox;
3677
3678our @ISA = CFPlus::UI::VBox::;
3679
3680sub new {
3681 my $class = shift;
3682
3683 my $self = $class->SUPER::new (
3073 fontsize => 0.8, 3684 fontsize => 0.8,
3074 @_, 3685 @_,
3075 ) 3686 );
3687
3688 CFPlus::weaken (my $this = $self);
3689
3690 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3691
3692 $self
3076} 3693}
3077 3694
3078sub reorder { 3695sub reorder {
3079 my ($self) = @_; 3696 my ($self) = @_;
3080 my $NOW = time; 3697 my $NOW = Time::HiRes::time;
3698
3699 # freeze display when hovering over any label
3700 return if $CFPlus::UI::TOOLTIP->{owner}
3701 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3702 values %{ $self->{item} };
3081 3703
3082 while (my ($k, $v) = each %{ $self->{item} }) { 3704 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3705 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 } 3706 }
3085 3707
… …
3088 my @items = sort { 3710 my @items = sort {
3089 $a->{pri} <=> $b->{pri} 3711 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id} 3712 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} }; 3713 } values %{ $self->{item} };
3092 3714
3715 $self->{timer}->interval (1);
3716
3093 my $count = 10 + 1; 3717 my $count = 10 + 1;
3094 for my $item (@items) { 3718 for my $item (@items) {
3095 last unless --$count; 3719 last unless --$count;
3096 3720
3097 push @widgets, $item->{label} ||= do { 3721 my $label = $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all) 3722 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1 3723 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}" 3724 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text}; 3725 : $item->{text};
3102 3726
3103 for ($short) { 3727 for ($short) {
3104 s/^\s+//; 3728 s/^\s+//;
3105 s/\s+/ /g; 3729 s/\s+/ /g;
3106 } 3730 }
3107 3731
3108 new CFClient::UI::Label 3732 new CFPlus::UI::Label
3109 markup => $short, 3733 markup => $short,
3110 tooltip => $item->{tooltip}, 3734 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP, 3735 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67, 3736 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize}, 3737 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44, 3738 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg}, 3739 fg => [@{ $item->{fg} }],
3116 can_events => 1, 3740 can_events => 1,
3117 can_hover => 1 3741 can_hover => 1
3118 }; 3742 };
3743
3744 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3745 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3746 $label->update;
3747 $label->set_max_size (undef, $label->{req_h} * $diff)
3748 if $diff < 1;
3749 $self->{timer}->interval (1/30);
3750 } else {
3751 $label->{fg}[3] = $item->{fg}[3] || 1;
3752 }
3753
3754 push @widgets, $label;
3119 } 3755 }
3120 3756
3121 $self->clear; 3757 $self->clear;
3122 $self->SUPER::add (reverse @widgets); 3758 $self->SUPER::add (reverse @widgets);
3123} 3759}
… …
3128 $text =~ s/^\s+//; 3764 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//; 3765 $text =~ s/\s+$//;
3130 3766
3131 return unless $text; 3767 return unless $text;
3132 3768
3133 my $timeout = time + ((delete $arg{timeout}) || 60); 3769 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134 3770
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3771 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136 3772
3137 if (my $item = $self->{item}{$group}) { 3773 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) { 3774 if ($item->{text} eq $text) {
3139 $item->{count}++; 3775 $item->{count}++;
3140 } else { 3776 } else {
3141 $item->{count} = 1; 3777 $item->{count} = 1;
3142 $item->{text} = $item->{tooltip} = $text; 3778 $item->{text} = $item->{tooltip} = $text;
3143 } 3779 }
3144 $item->{id} = ++$self->{id}; 3780 $item->{id} += 0.2;#d#
3145 $item->{timeout} = $timeout; 3781 $item->{timeout} = $timeout;
3146 delete $item->{label}; 3782 delete $item->{label};
3147 } else { 3783 } else {
3148 $self->{item}{$group} = { 3784 $self->{item}{$group} = {
3149 id => ++$self->{id}, 3785 id => ++$self->{id},
… …
3155 count => 1, 3791 count => 1,
3156 %arg, 3792 %arg,
3157 }; 3793 };
3158 } 3794 }
3159 3795
3796 $ROOT->on_refresh (reorder => sub {
3160 $self->reorder; 3797 $self->reorder;
3798 });
3161} 3799}
3162 3800
3163sub reconfigure { 3801sub reconfigure {
3164 my ($self) = @_; 3802 my ($self) = @_;
3165 3803
… …
3168 3806
3169 $self->reorder; 3807 $self->reorder;
3170 $self->SUPER::reconfigure; 3808 $self->SUPER::reconfigure;
3171} 3809}
3172 3810
3811sub destroy {
3812 my ($self) = @_;
3813
3814 $self->{timer}->cancel;
3815
3816 $self->SUPER::destroy;
3817}
3818
3173############################################################################# 3819#############################################################################
3174 3820
3175package CFClient::UI::Inventory;
3176
3177our @ISA = CFClient::UI::ScrolledWindow::;
3178
3179sub new {
3180 my $class = shift;
3181
3182 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3184 @_,
3185 );
3186
3187 $self
3188}
3189
3190sub set_items {
3191 my ($self, $items) = @_;
3192
3193 $self->{child}->clear;
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 }
3410}
3411
3412#############################################################################
3413
3414package CFClient::UI::SpellList;
3415
3416our @ISA = CFClient::UI::Table::;
3417
3418sub new {
3419 my $class = shift;
3420
3421 my $self = $class->SUPER::new (
3422 binding => [],
3423 commands => [],
3424 @_,
3425 )
3426}
3427
3428# XXX: Do sorting? Argl...
3429sub add_spell {
3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
3432
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460}
3461
3462sub remove_spell {
3463 my ($self, $spell) = @_;
3464 delete $self->{spells}->{$spell->{name}};
3465 $self->rebuild_spell_list;
3466}
3467
3468#############################################################################
3469
3470package CFClient::UI::Root; 3821package CFPlus::UI::Root;
3471 3822
3472our @ISA = CFClient::UI::Container::; 3823our @ISA = CFPlus::UI::Container::;
3473 3824
3825use List::Util qw(min max);
3826
3474use CFClient::OpenGL; 3827use CFPlus::OpenGL;
3475 3828
3476sub new { 3829sub new {
3477 my $class = shift; 3830 my $class = shift;
3478 3831
3479 my $self = $class->SUPER::new ( 3832 my $self = $class->SUPER::new (
3480 visible => 1, 3833 visible => 1,
3481 @_, 3834 @_,
3482 ); 3835 );
3483 3836
3484 Scalar::Util::weaken ($self->{root} = $self); 3837 CFPlus::weaken ($self->{root} = $self);
3485 3838
3486 $self 3839 $self
3487} 3840}
3488 3841
3489sub size_request { 3842sub size_request {
… …
3504 $coord = $max - $size if $coord > $max - $size; 3857 $coord = $max - $size if $coord > $max - $size;
3505 3858
3506 int $coord + 0.5 3859 int $coord + 0.5
3507} 3860}
3508 3861
3509sub size_allocate { 3862sub invoke_size_allocate {
3510 my ($self, $w, $h) = @_; 3863 my ($self, $w, $h) = @_;
3511 3864
3512 for my $child ($self->children) { 3865 for my $child ($self->children) {
3513 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)};
3514 3867
… …
3518 $X = _to_pixel $X, $W, $self->{w}; 3871 $X = _to_pixel $X, $W, $self->{w};
3519 $Y = _to_pixel $Y, $H, $self->{h}; 3872 $Y = _to_pixel $Y, $H, $self->{h};
3520 3873
3521 $child->configure ($X, $Y, $W, $H); 3874 $child->configure ($X, $Y, $W, $H);
3522 } 3875 }
3876
3877 1
3523} 3878}
3524 3879
3525sub coord2local { 3880sub coord2local {
3526 my ($self, $x, $y) = @_; 3881 my ($self, $x, $y) = @_;
3527 3882
… …
3612 3967
3613 delete $queue{$widget+0}; 3968 delete $queue{$widget+0};
3614 3969
3615 my ($w, $h) = $widget->size_request; 3970 my ($w, $h) = $widget->size_request;
3616 3971
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3972 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3973 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3974
3975 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3976 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3619 3977
3620 $w = $widget->{force_w} if exists $widget->{force_w}; 3978 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h}; 3979 $h = $widget->{force_h} if exists $widget->{force_h};
3622 3980
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3981 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3649 4007
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4008 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3651 4009
3652 $w = 0 if $w < 0; 4010 $w = 0 if $w < 0;
3653 $h = 0 if $h < 0; 4011 $h = 0 if $h < 0;
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};
3654 4021
3655 $w = int $w + 0.5; 4022 $w = int $w + 0.5;
3656 $h = int $h + 0.5; 4023 $h = int $h + 0.5;
3657 4024
3658 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}) {
… …
3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4049 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3683 glMatrixMode GL_MODELVIEW; 4050 glMatrixMode GL_MODELVIEW;
3684 glLoadIdentity; 4051 glLoadIdentity;
3685 4052
3686 { 4053 {
3687 package CFClient::UI::Base; 4054 package CFPlus::UI::Base;
3688 4055
3689 ($draw_x, $draw_y, $draw_w, $draw_h) = 4056 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h}); 4057 (0, 0, $self->{w}, $self->{h});
3691 }
3692 4058
3693 $self->_draw; 4059 $self->_draw;
4060 }
3694} 4061}
3695 4062
3696############################################################################# 4063#############################################################################
3697 4064
3698package CFClient::UI; 4065package CFPlus::UI;
3699 4066
3700$ROOT = new CFClient::UI::Root; 4067$ROOT = new CFPlus::UI::Root;
3701$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4068$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3702 4069
37031 40701
3704 4071

Diff Legend

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