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.371 by root, Sun Jul 15 22:07:48 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner};
51});
20 52
21sub get_layout { 53sub get_layout {
22 my $layout; 54 my $layout;
23 55
24 for (grep { $_->{name} } values %WIDGET) { 56 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 71 my ($layout) = @_;
40 72
41 $LAYOUT = $layout; 73 $LAYOUT = $layout;
42} 74}
43 75
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 76# class methods for events
73sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 78 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 79 if $FOCUS;
76} 80}
… …
78sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 84 if $FOCUS;
81} 85}
82 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
83sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
84 my ($ev) = @_; 101 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
86 103
87 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
89 108
90 $GRAB = $widget; 109 $GRAB = $widget;
91 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
92 111
93 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
94 } 113 }
95 114
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
97 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
99 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
100} 125}
101 126
102sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
103 my ($ev) = @_; 128 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 129
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 131
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 133
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
111 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 136
113 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 139 $grab->update if $grab;
116 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
117 141
118 check_tooltip; 142 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->();
119 } 144 }
120} 145}
121 146
122sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
123 my ($ev) = @_; 148 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
125 150
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 152
128 if ($widget != $HOVER) { 153 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 154
131 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 156 if $HOVER;
139} 157}
140 158
141# convert position array to integers 159# convert position array to integers
142sub harmonize { 160sub harmonize {
… …
192 reconfigure_widgets; 210 reconfigure_widgets;
193} 211}
194 212
195############################################################################# 213#############################################################################
196 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
197package CFClient::UI::Base; 223package CFPlus::UI::Base;
198 224
199use strict; 225use strict;
200 226
201use CFClient::OpenGL; 227use CFPlus::OpenGL;
202 228
203sub new { 229sub new {
204 my $class = shift; 230 my $class = shift;
205 231
206 my $self = bless { 232 my $self = bless {
… …
211 h => undef, 237 h => undef,
212 can_events => 1, 238 can_events => 1,
213 @_ 239 @_
214 }, $class; 240 }, $class;
215 241
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 243
218 for (keys %$self) { 244 for (keys %$self) {
219 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
221 } 247 }
222 } 248 }
223 249
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 255
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 258
233 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
238 264
239sub destroy { 265sub destroy {
240 my ($self) = @_; 266 my ($self) = @_;
241 267
242 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
243 %$self = (); 270 %$self = ();
244} 271}
245 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
246sub show { 277sub show {
247 my ($self) = @_; 278 my ($self) = @_;
248 279
249 return if $self->{parent}; 280 return if $self->{parent};
250 281
251 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
252} 283}
253 284
254sub set_visible { 285sub set_visible {
255 my ($self) = @_; 286 my ($self) = @_;
256 287
… …
271 302
272 return unless $self->{visible}; 303 return unless $self->{visible};
273 304
274 $_->set_invisible for $self->children; 305 $_->set_invisible for $self->children;
275 306
307 delete $self->{visible};
276 delete $self->{root}; 308 delete $self->{root};
277 delete $self->{visible};
278 309
279 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
281 312
282 CFClient::UI::check_tooltip 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
284 315
285 $self->focus_out; 316 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
289 319
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
314} 344}
315 345
316sub move_abs { 346sub move_abs {
317 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
318 348
319 $self->{x} = List::Util::max 0, int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
322 352
323 $self->update; 353 $self->update;
324} 354}
325 355
… …
335sub size_request { 365sub size_request {
336 require Carp; 366 require Carp;
337 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
338} 368}
339 369
370sub baseline_shift {
371 0
372}
373
340sub configure { 374sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
342 376
343 if ($self->{aspect}) { 377 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
345 379
346 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 382
349 # use alignment to adjust x, y 383 # use alignment to adjust x, y
350 384
351 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
366 400
367 $self->{root}{size_alloc}{$self+0} = $self; 401 $self->{root}{size_alloc}{$self+0} = $self;
368 } 402 }
369} 403}
370 404
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 405sub children {
376 # nop 406 # nop
377} 407}
378 408
379sub visible_children { 409sub visible_children {
… …
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 $child = ($self->{vp} or return)->child;
1106
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1114}
1115
993sub update { 1116sub update {
994 my ($self) = @_; 1117 my ($self) = @_;
995 1118
996 $self->SUPER::update; 1119 $self->SUPER::update;
997 1120 $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} 1121}
1002 1122
1003sub size_allocate { 1123sub invoke_size_allocate {
1004 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1005 1125
1126 $self->update_slider;
1006 $self->SUPER::size_allocate ($w, $h); 1127 $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} 1128}
1011
1012#TODO# update range on size_allocate depending on child
1013# update viewport offset on scroll
1014 1129
1015############################################################################# 1130#############################################################################
1016 1131
1017package CFClient::UI::Frame; 1132package CFPlus::UI::Frame;
1018 1133
1019our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1020 1135
1021use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1022 1137
1023sub new { 1138sub new {
1024 my $class = shift; 1139 my $class = shift;
1025 1140
1026 $class->SUPER::new ( 1141 $class->SUPER::new (
… …
1052 $self->SUPER::_draw; 1167 $self->SUPER::_draw;
1053} 1168}
1054 1169
1055############################################################################# 1170#############################################################################
1056 1171
1057package CFClient::UI::FancyFrame; 1172package CFPlus::UI::FancyFrame;
1058 1173
1059our @ISA = CFClient::UI::Bin::; 1174our @ISA = CFPlus::UI::Bin::;
1060 1175
1061use CFClient::OpenGL; 1176use 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 1177
1071sub new { 1178sub new {
1072 my ($class, %arg) = @_; 1179 my ($class, %arg) = @_;
1073 1180
1074 my $title = delete $arg{title}; 1181 if ((exists $arg{label}) && !ref $arg{label}) {
1182 $arg{label} = new CFPlus::UI::Label
1183 align => 1,
1184 valign => 0,
1185 text => $arg{label},
1186 fontsize => ($arg{border} || 0.8) * 0.75;
1187 }
1188
1189 my $self = $class->SUPER::new (
1190 # label => "",
1191 fg => [0.6, 0.3, 0.1],
1192 border => 0.8,
1193 style => 'single',
1194 %arg,
1195 );
1196
1197 $self
1198}
1199
1200sub add {
1201 my ($self, @widgets) = @_;
1202
1203 $self->SUPER::add (@widgets);
1204 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1205}
1206
1207sub border {
1208 int $_[0]{border} * $::FONTSIZE
1209}
1210
1211sub size_request {
1212 my ($self) = @_;
1213
1214 ($self->{label_w}, undef) = $self->{label}->size_request
1215 if $self->{label};
1216
1217 my ($w, $h) = $self->SUPER::size_request;
1218
1219 (
1220 $w + $self->border * 2,
1221 $h + $self->border * 2,
1222 )
1223}
1224
1225sub invoke_size_allocate {
1226 my ($self, $w, $h) = @_;
1227
1228 my $border = $self->border;
1229
1230 $w -= List::Util::max 0, $border * 2;
1231 $h -= List::Util::max 0, $border * 2;
1232
1233 if (my $label = $self->{label}) {
1234 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1235 $label->{h} = List::Util::min $h, $border;
1236 $label->invoke_size_allocate ($label->{w}, $label->{h});
1237 }
1238
1239 $self->child->configure ($border, $border, $w, $h);
1240
1241 1
1242}
1243
1244sub _draw {
1245 my ($self) = @_;
1246
1247 my $child = $self->{children}[0];
1248
1249 my $border = $self->border;
1250 my ($w, $h) = ($self->{w}, $self->{h});
1251
1252 $child->draw;
1253
1254 glColor @{$self->{fg}};
1255 glBegin GL_LINE_STRIP;
1256 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1257 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1258 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1259 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1260 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1261 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1262 glEnd;
1263
1264 if ($self->{label}) {
1265 glTranslate $border * 2, 0;
1266 $self->{label}->_draw;
1267 }
1268}
1269
1270#############################################################################
1271
1272package CFPlus::UI::Toplevel;
1273
1274our @ISA = CFPlus::UI::Bin::;
1275
1276use CFPlus::OpenGL;
1277
1278my $bg =
1279 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1280 mipmap => 1, wrap => 1;
1281
1282my @border =
1283 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1285
1286sub new {
1287 my ($class, %arg) = @_;
1075 1288
1076 my $self = $class->SUPER::new ( 1289 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1290 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1291 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1292 border => 0.6,
1080 can_events => 1, 1293 can_events => 1,
1081 min_w => 16, 1294 min_w => 64,
1082 min_h => 16, 1295 min_h => 32,
1083 %arg, 1296 %arg,
1084 ); 1297 );
1085 1298
1086 $self->{title} = new CFClient::UI::Label 1299 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 1300 align => 0,
1088 valign => 1, 1301 valign => 1,
1089 text => $title, 1302 text => $self->{title},
1090 fontsize => $self->{border} 1303 fontsize => $self->{border},
1091 if defined $title; 1304 if exists $self->{title};
1305
1306 if ($self->{has_close_button}) {
1307 $self->{close_button} =
1308 new CFPlus::UI::ImageButton
1309 path => 'x1_close.png',
1310 on_activate => sub { $self->emit ("delete") };
1311
1312 $self->CFPlus::UI::Container::add ($self->{close_button});
1313 }
1092 1314
1093 $self 1315 $self
1094} 1316}
1095 1317
1096sub add { 1318sub add {
1097 my ($self, @widgets) = @_; 1319 my ($self, @widgets) = @_;
1098 1320
1099 $self->SUPER::add (@widgets); 1321 $self->SUPER::add (@widgets);
1322 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1323 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1101} 1324}
1102 1325
1103sub border { 1326sub border {
1104 int $_[0]{border} * $::FONTSIZE 1327 int $_[0]{border} * $::FONTSIZE
1105} 1328}
1106 1329
1107sub size_request { 1330sub size_request {
1108 my ($self) = @_; 1331 my ($self) = @_;
1109 1332
1110 $self->{title}->size_request 1333 $self->{title_widget}->size_request
1111 if $self->{title}; 1334 if $self->{title_widget};
1335
1336 $self->{close_button}->size_request
1337 if $self->{close_button};
1112 1338
1113 my ($w, $h) = $self->SUPER::size_request; 1339 my ($w, $h) = $self->SUPER::size_request;
1114 1340
1115 ( 1341 (
1116 $w + $self->border * 2, 1342 $w + $self->border * 2,
1117 $h + $self->border * 2, 1343 $h + $self->border * 2,
1118 ) 1344 )
1119} 1345}
1120 1346
1121sub size_allocate { 1347sub invoke_size_allocate {
1122 my ($self, $w, $h) = @_; 1348 my ($self, $w, $h) = @_;
1123 1349
1124 if ($self->{title}) { 1350 if ($self->{title_widget}) {
1125 $self->{title}{w} = $w; 1351 $self->{title_widget}{w} = $w;
1126 $self->{title}{h} = $h; 1352 $self->{title_widget}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h); 1353 $self->{title_widget}->invoke_size_allocate ($w, $h);
1128 } 1354 }
1129 1355
1130 my $border = $self->border; 1356 my $border = $self->border;
1131 1357
1132 $h -= List::Util::max 0, $border * 2; 1358 $h -= List::Util::max 0, $border * 2;
1133 $w -= List::Util::max 0, $border * 2; 1359 $w -= List::Util::max 0, $border * 2;
1360
1361 $self->child->configure ($border, $border, $w, $h);
1362
1363 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1364 if $self->{close_button};
1365
1366 1
1367}
1368
1369sub invoke_delete {
1370 my ($self) = @_;
1371
1372 $self->hide;
1134 1373
1135 $self->child->configure ($border, $border, $w, $h); 1374 1
1136} 1375}
1137 1376
1138sub button_down { 1377sub invoke_button_down {
1139 my ($self, $ev, $x, $y) = @_; 1378 my ($self, $ev, $x, $y) = @_;
1140 1379
1141 my ($w, $h) = @$self{qw(w h)}; 1380 my ($w, $h) = @$self{qw(w h)};
1142 my $border = $self->border; 1381 my $border = $self->border;
1143 1382
… …
1174 1413
1175 ($x, $y) = ($ev->{x}, $ev->{y}); 1414 ($x, $y) = ($ev->{x}, $ev->{y});
1176 1415
1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1416 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1178 # HACK: the next line is required to enforce placement 1417 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1418 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1180 }; 1419 };
1181 } else { 1420 } else {
1182 return 0; 1421 return 0;
1183 } 1422 }
1184 1423
1185 1 1424 1
1186} 1425}
1187 1426
1188sub button_up { 1427sub invoke_button_up {
1189 my ($self, $ev, $x, $y) = @_; 1428 my ($self, $ev, $x, $y) = @_;
1190 1429
1191 !!delete $self->{motion} 1430 ! ! delete $self->{motion}
1192} 1431}
1193 1432
1194sub mouse_motion { 1433sub invoke_mouse_motion {
1195 my ($self, $ev, $x, $y) = @_; 1434 my ($self, $ev, $x, $y) = @_;
1196 1435
1197 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1436 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198 1437
1199 !!$self->{motion} 1438 ! ! $self->{motion}
1439}
1440
1441sub invoke_visibility_change {
1442 my ($self, $visible) = @_;
1443
1444 delete $self->{motion} unless $visible;
1445
1446 0
1200} 1447}
1201 1448
1202sub _draw { 1449sub _draw {
1203 my ($self) = @_; 1450 my ($self) = @_;
1204 1451
… …
1230 1477
1231 glDisable GL_TEXTURE_2D; 1478 glDisable GL_TEXTURE_2D;
1232 1479
1233 $child->draw; 1480 $child->draw;
1234 1481
1235 if ($self->{title}) { 1482 if ($self->{title_widget}) {
1236 glTranslate 0, $border - $self->{h}; 1483 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw; 1484 $self->{title_widget}->_draw;
1485
1486 glTranslate 0, - ($border - $self->{h});
1238 } 1487 }
1488
1489 $self->{close_button}->draw
1490 if $self->{close_button};
1239} 1491}
1240 1492
1241############################################################################# 1493#############################################################################
1242 1494
1243package CFClient::UI::Table; 1495package CFPlus::UI::Table;
1244 1496
1245our @ISA = CFClient::UI::Base::; 1497our @ISA = CFPlus::UI::Base::;
1246 1498
1247use List::Util qw(max sum); 1499use List::Util qw(max sum);
1248 1500
1249use CFClient::OpenGL; 1501use CFPlus::OpenGL;
1250 1502
1251sub new { 1503sub new {
1252 my $class = shift; 1504 my $class = shift;
1253 1505
1254 $class->SUPER::new ( 1506 $class->SUPER::new (
1255 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1256 @_, 1509 @_,
1257 ) 1510 )
1258} 1511}
1259 1512
1260sub children { 1513sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1262} 1515}
1263 1516
1264sub add { 1517sub add {
1265 my ($self, $x, $y, $child) = @_; 1518 my ($self) = shift;
1266 1519
1520 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, ();
1267 $child->set_parent ($self); 1522 $child->set_parent ($self);
1268 $self->{children}[$y][$x] = $child; 1523 $self->{children}[$y][$x] = $child;
1524 }
1269 1525
1526 $self->{force_realloc} = 1;
1527 $self->{force_size_alloc} = 1;
1270 $self->realloc; 1528 $self->realloc;
1529}
1530
1531sub remove {
1532 my ($self, $child) = @_;
1533
1534 # TODO: not yet implemented
1271} 1535}
1272 1536
1273# TODO: move to container class maybe? send children a signal on removal? 1537# TODO: move to container class maybe? send children a signal on removal?
1274sub clear { 1538sub clear {
1275 my ($self) = @_; 1539 my ($self) = @_;
… …
1316 (sum @$ws), 1580 (sum @$ws),
1317 (sum @$hs), 1581 (sum @$hs),
1318 ) 1582 )
1319} 1583}
1320 1584
1321sub size_allocate { 1585sub invoke_size_allocate {
1322 my ($self, $w, $h) = @_; 1586 my ($self, $w, $h) = @_;
1323 1587
1324 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1325 1589
1326 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1327 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1328 1592
1329 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1330 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1331 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1332 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1333 1597
1334 # linearly scale sizes
1335 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1336 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1337 1599
1338 CFClient::UI::harmonize $ws; 1600 CFPlus::UI::harmonize $ws;
1601
1602 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1;
1605
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607
1339 CFClient::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1340 1609
1341 my $y; 1610 my $y;
1342 1611
1343 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
1344 my $row = $self->{children}[$r] 1613 my $row = $self->{children}[$r]
… …
1358 } 1627 }
1359 1628
1360 $y += $row_h; 1629 $y += $row_h;
1361 } 1630 }
1362 1631
1632 1
1363} 1633}
1364 1634
1365sub find_widget { 1635sub find_widget {
1366 my ($self, $x, $y) = @_; 1636 my ($self, $x, $y) = @_;
1367 1637
… …
1386 } 1656 }
1387} 1657}
1388 1658
1389############################################################################# 1659#############################################################################
1390 1660
1391package CFClient::UI::Box; 1661package CFPlus::UI::Box;
1392 1662
1393our @ISA = CFClient::UI::Container::; 1663our @ISA = CFPlus::UI::Container::;
1394 1664
1395sub size_request { 1665sub size_request {
1396 my ($self) = @_; 1666 my ($self) = @_;
1397 1667
1398 $self->{vertical} 1668 $self->{vertical}
… …
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1674 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1675 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 ) 1676 )
1407} 1677}
1408 1678
1409sub size_allocate { 1679sub invoke_size_allocate {
1410 my ($self, $w, $h) = @_; 1680 my ($self, $w, $h) = @_;
1411 1681
1412 my $space = $self->{vertical} ? $h : $w; 1682 my $space = $self->{vertical} ? $h : $w;
1413 my $children = $self->{children}; 1683 my @children = $self->visible_children;
1414 1684
1415 my @req; 1685 my @req;
1416 1686
1417 if ($self->{homogeneous}) { 1687 if ($self->{homogeneous}) {
1418 @req = ($space / (@$children || 1)) x @$children; 1688 @req = ($space / (@children || 1)) x @children;
1419 } else { 1689 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1690 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1421 my $req = List::Util::sum @req; 1691 my $req = List::Util::sum @req;
1422 1692
1423 if ($req > $space) { 1693 if ($req > $space) {
1424 # ah well, not enough space 1694 # ah well, not enough space
1425 $_ *= $space / $req for @req; 1695 $_ *= $space / $req for @req;
1426 } else { 1696 } else {
1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1697 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1428 1698
1429 $space = ($space - $req) / $expand; # remaining space to give away 1699 $space = ($space - $req) / $expand; # remaining space to give away
1430 1700
1431 $req[$_] += $space * $children->[$_]{expand} 1701 $req[$_] += $space * $children[$_]{expand}
1432 for 0 .. $#$children; 1702 for 0 .. $#children;
1433 } 1703 }
1434 } 1704 }
1435 1705
1436 CFClient::UI::harmonize \@req; 1706 CFPlus::UI::harmonize \@req;
1437 1707
1438 my $pos = 0; 1708 my $pos = 0;
1439 for (0 .. $#$children) { 1709 for (0 .. $#children) {
1440 my $alloc = $req[$_]; 1710 my $alloc = $req[$_];
1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1711 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1442 1712
1443 $pos += $alloc; 1713 $pos += $alloc;
1444 } 1714 }
1445 1715
1446 1 1716 1
1447} 1717}
1448 1718
1449############################################################################# 1719#############################################################################
1450 1720
1451package CFClient::UI::HBox; 1721package CFPlus::UI::HBox;
1452 1722
1453our @ISA = CFClient::UI::Box::; 1723our @ISA = CFPlus::UI::Box::;
1454 1724
1455sub new { 1725sub new {
1456 my $class = shift; 1726 my $class = shift;
1457 1727
1458 $class->SUPER::new ( 1728 $class->SUPER::new (
… …
1461 ) 1731 )
1462} 1732}
1463 1733
1464############################################################################# 1734#############################################################################
1465 1735
1466package CFClient::UI::VBox; 1736package CFPlus::UI::VBox;
1467 1737
1468our @ISA = CFClient::UI::Box::; 1738our @ISA = CFPlus::UI::Box::;
1469 1739
1470sub new { 1740sub new {
1471 my $class = shift; 1741 my $class = shift;
1472 1742
1473 $class->SUPER::new ( 1743 $class->SUPER::new (
… …
1476 ) 1746 )
1477} 1747}
1478 1748
1479############################################################################# 1749#############################################################################
1480 1750
1481package CFClient::UI::Label; 1751package CFPlus::UI::Label;
1482 1752
1483our @ISA = CFClient::UI::DrawBG::; 1753our @ISA = CFPlus::UI::DrawBG::;
1484 1754
1485use CFClient::OpenGL; 1755use CFPlus::OpenGL;
1486 1756
1487sub new { 1757sub new {
1488 my ($class, %arg) = @_; 1758 my ($class, %arg) = @_;
1489 1759
1490 my $self = $class->SUPER::new ( 1760 my $self = $class->SUPER::new (
… …
1493 #active_bg => none 1763 #active_bg => none
1494 #font => default_font 1764 #font => default_font
1495 #text => initial text 1765 #text => initial text
1496 #markup => initial narkup 1766 #markup => initial narkup
1497 #max_w => maximum pixel width 1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1498 ellipsise => 3, # end 1769 ellipsise => 3, # end
1499 layout => (new CFClient::Layout), 1770 layout => (new CFPlus::Layout),
1500 fontsize => 1, 1771 fontsize => 1,
1501 align => -1, 1772 align => -1,
1502 valign => -1, 1773 valign => -1,
1503 padding_x => 2, 1774 padding_x => 2,
1504 padding_y => 2, 1775 padding_y => 2,
1505 can_events => 0, 1776 can_events => 0,
1506 %arg 1777 %arg
1507 ); 1778 );
1508 1779
1509 if (exists $self->{template}) { 1780 if (exists $self->{template}) {
1510 my $layout = new CFClient::Layout; 1781 my $layout = new CFPlus::Layout;
1511 $layout->set_text (delete $self->{template}); 1782 $layout->set_text (delete $self->{template});
1512 $self->{template} = $layout; 1783 $self->{template} = $layout;
1513 } 1784 }
1514 1785
1515 if (exists $self->{markup}) { 1786 if (exists $self->{markup}) {
… …
1519 } 1790 }
1520 1791
1521 $self 1792 $self
1522} 1793}
1523 1794
1524sub escape($) {
1525 local $_ = $_[0];
1526
1527 s/&/&amp;/g;
1528 s/>/&gt;/g;
1529 s/</&lt;/g;
1530
1531 $_
1532}
1533
1534sub update { 1795sub update {
1535 my ($self) = @_; 1796 my ($self) = @_;
1536 1797
1537 delete $self->{texture}; 1798 delete $self->{texture};
1538 $self->SUPER::update; 1799 $self->SUPER::update;
1539} 1800}
1540 1801
1802sub realloc {
1803 my ($self) = @_;
1804
1805 delete $self->{ox};
1806 $self->SUPER::realloc;
1807}
1808
1541sub set_text { 1809sub set_text {
1542 my ($self, $text) = @_; 1810 my ($self, $text) = @_;
1543 1811
1544 return if $self->{text} eq "T$text"; 1812 return if $self->{text} eq "T$text";
1545 $self->{text} = "T$text"; 1813 $self->{text} = "T$text";
1546 1814
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1548 $self->{layout}->set_text ($text); 1815 $self->{layout}->set_text ($text);
1549 1816
1817 delete $self->{size_req};
1550 $self->realloc; 1818 $self->realloc;
1551 $self->update; 1819 $self->update;
1552} 1820}
1553 1821
1554sub set_markup { 1822sub set_markup {
… …
1557 return if $self->{text} eq "M$markup"; 1825 return if $self->{text} eq "M$markup";
1558 $self->{text} = "M$markup"; 1826 $self->{text} = "M$markup";
1559 1827
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1828 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561 1829
1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1563 $self->{layout}->set_markup ($markup); 1830 $self->{layout}->set_markup ($markup);
1564 1831
1832 delete $self->{size_req};
1565 $self->realloc; 1833 $self->realloc;
1566 $self->update; 1834 $self->update;
1567} 1835}
1568 1836
1569sub size_request { 1837sub size_request {
1570 my ($self) = @_; 1838 my ($self) = @_;
1571 1839
1840 $self->{size_req} ||= do {
1572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1841 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1); 1842 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1843 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1844 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1845 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577 1846
1578 my ($w, $h) = $self->{layout}->size; 1847 my ($w, $h) = $self->{layout}->size;
1579 1848
1580 if (exists $self->{template}) { 1849 if (exists $self->{template}) {
1581 $self->{template}->set_font ($self->{font}) if $self->{font}; 1850 $self->{template}->set_font ($self->{font}) if $self->{font};
1851 $self->{template}->set_width ($self->{max_w} || -1);
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 1853
1584 my ($w2, $h2) = $self->{template}->size; 1854 my ($w2, $h2) = $self->{template}->size;
1585 1855
1586 $w = List::Util::max $w, $w2; 1856 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2; 1857 $h = List::Util::max $h, $h2;
1858 }
1859
1860 [$w, $h]
1588 } 1861 };
1589 1862
1590 ($w, $h) 1863 @{ $self->{size_req} }
1591} 1864}
1592 1865
1866sub baseline_shift {
1867 $_[0]{layout}->descent
1868}
1869
1593sub size_allocate { 1870sub invoke_size_allocate {
1594 my ($self, $w, $h) = @_; 1871 my ($self, $w, $h) = @_;
1595 1872
1596 delete $self->{ox}; 1873 delete $self->{ox};
1597 1874
1598 delete $self->{texture} 1875 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1876 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1877
1878 1
1600} 1879}
1601 1880
1602sub set_fontsize { 1881sub set_fontsize {
1603 my ($self, $fontsize) = @_; 1882 my ($self, $fontsize) = @_;
1604 1883
1605 $self->{fontsize} = $fontsize; 1884 $self->{fontsize} = $fontsize;
1885 delete $self->{size_req};
1606 delete $self->{texture}; 1886 delete $self->{texture};
1607 1887
1608 $self->realloc; 1888 $self->realloc;
1609} 1889}
1610 1890
1891sub reconfigure {
1892 my ($self) = @_;
1893
1894 delete $self->{size_req};
1895 delete $self->{texture};
1896
1897 $self->SUPER::reconfigure;
1898}
1899
1611sub _draw { 1900sub _draw {
1612 my ($self) = @_; 1901 my ($self) = @_;
1613 1902
1614 $self->SUPER::_draw; # draw background, if applicable 1903 $self->SUPER::_draw; # draw background, if applicable
1615 1904
1616 my $tex = $self->{texture} ||= do { 1905 my $size = $self->{texture} ||= do {
1617 $self->{layout}->set_foreground (@{$self->{fg}}); 1906 $self->{layout}->set_foreground (@{$self->{fg}});
1618 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1907 $self->{layout}->set_font ($self->{font}) if $self->{font};
1619 $self->{layout}->set_width ($self->{w}); 1908 $self->{layout}->set_width ($self->{w});
1620 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1909 $self->{layout}->set_ellipsise ($self->{ellipsise});
1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1910 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1911 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1912
1624 new_from_layout CFClient::Texture $self->{layout} 1913 [$self->{layout}->size]
1625 }; 1914 };
1626 1915
1627 unless (exists $self->{ox}) { 1916 unless (exists $self->{ox}) {
1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1917 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1918 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1630 : ($self->{w} - $tex->{w}) * 0.5); 1919 : ($self->{w} - $size->[0]) * 0.5);
1631 1920
1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1634 : ($self->{h} - $tex->{h}) * 0.5); 1923 : ($self->{h} - $size->[1]) * 0.5);
1635 }; 1924 };
1636 1925
1637 glEnable GL_TEXTURE_2D; 1926 my $w = List::Util::min $self->{w} + 4, $size->[0];
1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1927 my $h = List::Util::min $self->{h} + 2, $size->[1];
1639 1928
1640 glColor_premultiply @{$self->{fg}} 1929 $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} 1930}
1647 1931
1648############################################################################# 1932#############################################################################
1649 1933
1650package CFClient::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
1651 1935
1652our @ISA = CFClient::UI::Label::; 1936our @ISA = CFPlus::UI::Label::;
1653 1937
1654use CFClient::OpenGL; 1938use CFPlus::OpenGL;
1655 1939
1656sub new { 1940sub new {
1657 my $class = shift; 1941 my $class = shift;
1658 1942
1659 $class->SUPER::new ( 1943 $class->SUPER::new (
… …
1663 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1664 can_hover => 1, 1948 can_hover => 1,
1665 can_focus => 1, 1949 can_focus => 1,
1666 valign => 0, 1950 valign => 0,
1667 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1668 #text => ... 1953 #text => ...
1954 #hidden => "*",
1669 @_ 1955 @_
1670 ) 1956 )
1671} 1957}
1672 1958
1673sub _set_text { 1959sub _set_text {
… …
1680 $self->{last_activity} = $::NOW; 1966 $self->{last_activity} = $::NOW;
1681 $self->{text} = $text; 1967 $self->{text} = $text;
1682 1968
1683 $text =~ s/./*/g if $self->{hidden}; 1969 $text =~ s/./*/g if $self->{hidden};
1684 $self->{layout}->set_text ("$text "); 1970 $self->{layout}->set_text ("$text ");
1971 delete $self->{size_req};
1685 1972
1686 $self->_emit (changed => $self->{text}); 1973 $self->emit (changed => $self->{text});
1974
1975 $self->realloc;
1687 $self->update; 1976 $self->update;
1688} 1977}
1689 1978
1690sub set_text { 1979sub set_text {
1691 my ($self, $text) = @_; 1980 my ($self, $text) = @_;
1692 1981
1693 $self->{cursor} = length $text; 1982 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1983 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1984}
1698 1985
1699sub get_text { 1986sub get_text {
1700 $_[0]{text} 1987 $_[0]{text}
1701} 1988}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1993 my ($w, $h) = $self->SUPER::size_request;
1707 1994
1708 ($w + 1, $h) # add 1 for cursor 1995 ($w + 1, $h) # add 1 for cursor
1709} 1996}
1710 1997
1711sub key_down { 1998sub invoke_key_down {
1712 my ($self, $ev) = @_; 1999 my ($self, $ev) = @_;
1713 2000
1714 my $mod = $ev->{mod}; 2001 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1717 2004
1718 my $text = $self->get_text; 2005 my $text = $self->get_text;
2006
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1719 2008
1720 if ($uni == 8) { 2009 if ($uni == 8) {
1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1722 } elsif ($uni == 127) { 2011 } elsif ($uni == 127) {
1723 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1724 } elsif ($sym == CFClient::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1725 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1726 } elsif ($sym == CFClient::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1727 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1728 } elsif ($sym == CFClient::SDLK_HOME) { 2017 } elsif ($sym == CFPlus::SDLK_HOME) {
2018 # what a hack
2019 $self->{cursor} =
2020 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2021 ? length $1
2022 : 0;
2023 } elsif ($sym == CFPlus::SDLK_END) {
2024 # uh, again
2025 $self->{cursor} =
2026 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2027 ? $self->{cursor} + length $1
2028 : length $self->{text};
2029 } elsif ($uni == 21) { # ctrl-u
2030 $text = "";
1729 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 2032 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 2033 $self->emit ('escape');
1734 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 2038 } else {
1737 return 0; 2039 return 0;
1738 } 2040 }
1739 2041
1740 $self->_set_text ($text); 2042 $self->_set_text ($text);
1741 2043
1742 $self->realloc; 2044 $self->realloc;
2045 $self->update;
1743 2046
1744 1 2047 1
1745} 2048}
1746 2049
1747sub focus_in { 2050sub invoke_focus_in {
1748 my ($self) = @_; 2051 my ($self) = @_;
1749 2052
1750 $self->{last_activity} = $::NOW; 2053 $self->{last_activity} = $::NOW;
1751 2054
1752 $self->SUPER::focus_in; 2055 $self->SUPER::invoke_focus_in
1753} 2056}
1754 2057
1755sub button_down { 2058sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 2059 my ($self, $ev, $x, $y) = @_;
1757 2060
1758 $self->SUPER::button_down ($ev, $x, $y); 2061 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 2062
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 2063 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 2064
1762 # byte-index to char-index 2065 # byte-index to char-index
1763 my $text = $self->{text}; 2066 my $text = $self->{text};
1764 utf8::encode $text; 2067 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 2068 $self->{cursor} = length $text;
1766 2069
1767 $self->_set_text ($self->{text}); 2070 $self->_set_text ($self->{text});
1768 $self->update; 2071 $self->update;
1769 2072
1770 1 2073 1
1771} 2074}
1772 2075
1773sub mouse_motion { 2076sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 2077 my ($self, $ev, $x, $y) = @_;
1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2078# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776 2079
1777 0 2080 1
1778} 2081}
1779 2082
1780sub _draw { 2083sub _draw {
1781 my ($self) = @_; 2084 my ($self) = @_;
1782 2085
… …
1809 utf8::encode $text; 2112 utf8::encode $text;
1810 2113
1811 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2114 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1812 } 2115 }
1813 2116
1814 glColor @{$self->{fg}};
1815 glBegin GL_LINES; 2117 glBegin GL_LINES;
1816 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2118 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1817 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1818 glEnd; 2120 glEnd;
1819 } 2121 }
1820} 2122}
1821 2123
2124#############################################################################
2125
1822package CFClient::UI::Entry; 2126package CFPlus::UI::Entry;
1823 2127
1824our @ISA = CFClient::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1825 2129
1826use CFClient::OpenGL; 2130use CFPlus::OpenGL;
1827 2131
1828sub key_down { 2132sub invoke_key_down {
1829 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1830 2134
1831 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1832 2136
1833 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1834 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
2140
1836 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 2143 $self->emit (activate => $txt);
1839 $self->update; 2144 $self->update;
1840 2145
1841 } elsif ($sym == CFClient::SDLK_UP) { 2146 } elsif ($sym == CFPlus::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 2147 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 2148 $self->{history_saveback} = $self->get_text;
1844 } 2149 }
1845 if (@{$self->{history} || []} > 0) { 2150 if (@{$self->{history} || []} > 0) {
1846 $self->{history_pointer}++; 2151 $self->{history_pointer}++;
… …
1848 $self->{history_pointer} = @{$self->{history} || []} - 1; 2153 $self->{history_pointer} = @{$self->{history} || []} - 1;
1849 } 2154 }
1850 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2155 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1851 } 2156 }
1852 2157
1853 } elsif ($sym == CFClient::SDLK_DOWN) { 2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
1854 $self->{history_pointer}--; 2159 $self->{history_pointer}--;
1855 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1856 2161
1857 if ($self->{history_pointer} >= 0) { 2162 if ($self->{history_pointer} >= 0) {
1858 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2163 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1859 } else { 2164 } else {
1860 $self->set_text ($self->{history_saveback}); 2165 $self->set_text ($self->{history_saveback});
1861 } 2166 }
1862 2167
1863 } else { 2168 } else {
1864 return $self->SUPER::key_down ($ev) 2169 return $self->SUPER::invoke_key_down ($ev)
1865 } 2170 }
1866 2171
1867 1 2172 1
1868} 2173}
1869 2174
1870############################################################################# 2175#############################################################################
1871 2176
2177package CFPlus::UI::TextEdit;
2178
2179our @ISA = CFPlus::UI::EntryBase::;
2180
2181use CFPlus::OpenGL;
2182
2183sub move_cursor_ver {
2184 my ($self, $dy) = @_;
2185
2186 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2187
2188 $y += $dy;
2189
2190 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2191 $self->{cursor} = $index;
2192 delete $self->{cur_h};
2193 $self->update;
2194 return;
2195 }
2196}
2197
2198sub invoke_key_down {
2199 my ($self, $ev) = @_;
2200
2201 my $sym = $ev->{sym};
2202
2203 if ($sym == CFPlus::SDLK_UP) {
2204 $self->move_cursor_ver (-1);
2205 } elsif ($sym == CFPlus::SDLK_DOWN) {
2206 $self->move_cursor_ver (+1);
2207 } else {
2208 return $self->SUPER::invoke_key_down ($ev)
2209 }
2210
2211 1
2212}
2213
2214#############################################################################
2215
1872package CFClient::UI::Button; 2216package CFPlus::UI::Button;
1873 2217
1874our @ISA = CFClient::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
1875 2219
1876use CFClient::OpenGL; 2220use CFPlus::OpenGL;
1877 2221
1878my @tex = 2222my @tex =
1879 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1880 qw(b1_button_active.png); 2224 qw(b1_button_active.png);
1881 2225
1882sub new { 2226sub new {
1883 my $class = shift; 2227 my $class = shift;
1884 2228
… …
1893 can_events => 1, 2237 can_events => 1,
1894 @_ 2238 @_
1895 ) 2239 )
1896} 2240}
1897 2241
1898sub activate { }
1899
1900sub button_up { 2242sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1902 2244
1903 $self->emit ("activate") 2245 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2246 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2247 && $y >= 0 && $y < $self->{h};
… …
1923 $self->SUPER::_draw; 2265 $self->SUPER::_draw;
1924} 2266}
1925 2267
1926############################################################################# 2268#############################################################################
1927 2269
1928package CFClient::UI::CheckBox; 2270package CFPlus::UI::CheckBox;
1929 2271
1930our @ISA = CFClient::UI::DrawBG::; 2272our @ISA = CFPlus::UI::DrawBG::;
1931 2273
1932my @tex = 2274my @tex =
1933 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1934 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2276 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1935 2277
1936use CFClient::OpenGL; 2278use CFPlus::OpenGL;
1937 2279
1938sub new { 2280sub new {
1939 my $class = shift; 2281 my $class = shift;
1940 2282
1941 $class->SUPER::new ( 2283 $class->SUPER::new (
… …
1955 my ($self) = @_; 2297 my ($self) = @_;
1956 2298
1957 (6) x 2 2299 (6) x 2
1958} 2300}
1959 2301
2302sub toggle {
2303 my ($self) = @_;
2304
2305 $self->{state} = !$self->{state};
2306 $self->emit (changed => $self->{state});
2307 $self->update;
2308}
2309
1960sub button_down { 2310sub invoke_button_down {
1961 my ($self, $ev, $x, $y) = @_; 2311 my ($self, $ev, $x, $y) = @_;
1962 2312
1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2313 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2314 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1965 $self->{state} = !$self->{state}; 2315 $self->toggle;
1966 $self->_emit (changed => $self->{state});
1967 } else { 2316 } else {
1968 return 0 2317 return 0
1969 } 2318 }
1970 2319
1971 1 2320 1
… …
1991 glDisable GL_TEXTURE_2D; 2340 glDisable GL_TEXTURE_2D;
1992} 2341}
1993 2342
1994############################################################################# 2343#############################################################################
1995 2344
1996package CFClient::UI::Image; 2345package CFPlus::UI::Image;
1997 2346
1998our @ISA = CFClient::UI::Base::; 2347our @ISA = CFPlus::UI::Base::;
1999 2348
2000use CFClient::OpenGL; 2349use CFPlus::OpenGL;
2001use Carp qw/confess/;
2002 2350
2003our %loaded_images; 2351our %texture_cache;
2004 2352
2005sub new { 2353sub new {
2006 my $class = shift; 2354 my $class = shift;
2007 2355
2008 my $self = $class->SUPER::new (can_events => 0, @_); 2356 my $self = $class->SUPER::new (
2357 can_events => 0,
2358 @_,
2359 );
2009 2360
2010 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2361 $self->{path} || $self->{tex}
2362 or Carp::croak "'path' or 'tex' attributes required";
2011 2363
2012 $loaded_images{$self->{image}} ||= 2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2013 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2365 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2014 2366
2015 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2367 CFPlus::weaken $texture_cache{$self->{path}};
2016 2368
2017 Scalar::Util::weaken $loaded_images{$self->{image}}; 2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2018
2019 $self->{aspect} = $tex->{w} / $tex->{h};
2020 2370
2021 $self 2371 $self
2022} 2372}
2023 2373
2374sub STORABLE_freeze {
2375 my ($self, $cloning) = @_;
2376
2377 $self->{path}
2378 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2379
2380 $self->{path}
2381}
2382
2383sub STORABLE_attach {
2384 my ($self, $cloning, $path) = @_;
2385
2386 $self->new (path => $path)
2387}
2388
2024sub size_request { 2389sub size_request {
2025 my ($self) = @_; 2390 my ($self) = @_;
2026 2391
2027 ($self->{tex}->{w}, $self->{tex}->{h}) 2392 ($self->{tex}{w}, $self->{tex}{h})
2028} 2393}
2029 2394
2030sub _draw { 2395sub _draw {
2031 my ($self) = @_; 2396 my ($self) = @_;
2032 2397
… …
2042 } 2407 }
2043 2408
2044 glEnable GL_TEXTURE_2D; 2409 glEnable GL_TEXTURE_2D;
2045 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2046 2411
2047 $tex->draw_quad_alpha (0, 0, $w, $h); 2412 $tex->draw_quad (0, 0, $w, $h);
2048 2413
2049 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2050} 2415}
2051 2416
2052############################################################################# 2417#############################################################################
2053 2418
2419package CFPlus::UI::ImageButton;
2420
2421our @ISA = CFPlus::UI::Image::;
2422
2423use CFPlus::OpenGL;
2424
2425my %textures;
2426
2427sub new {
2428 my $class = shift;
2429
2430 my $self = $class->SUPER::new (
2431 padding_x => 4,
2432 padding_y => 4,
2433 fg => [1, 1, 1],
2434 active_fg => [0, 0, 1],
2435 can_hover => 1,
2436 align => 0,
2437 valign => 0,
2438 can_events => 1,
2439 @_
2440 );
2441}
2442
2443sub invoke_button_up {
2444 my ($self, $ev, $x, $y) = @_;
2445
2446 $self->emit ("activate")
2447 if $x >= 0 && $x < $self->{w}
2448 && $y >= 0 && $y < $self->{h};
2449
2450 1
2451}
2452
2453#############################################################################
2454
2054package CFClient::UI::VGauge; 2455package CFPlus::UI::VGauge;
2055 2456
2056our @ISA = CFClient::UI::Base::; 2457our @ISA = CFPlus::UI::Base::;
2057 2458
2058use List::Util qw(min max); 2459use List::Util qw(min max);
2059 2460
2060use CFClient::OpenGL; 2461use CFPlus::OpenGL;
2061 2462
2062my %tex = ( 2463my %tex = (
2063 food => [ 2464 food => [
2064 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2065 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2066 ], 2467 ],
2067 grace => [ 2468 grace => [
2068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2469 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/ 2470 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2070 ], 2471 ],
2071 hp => [ 2472 hp => [
2072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2073 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2074 ], 2475 ],
2075 mana => [ 2476 mana => [
2076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2477 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/ 2478 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2078 ], 2479 ],
2079); 2480);
2080 2481
2081# eg. VGauge->new (gauge => 'food'), default gauge: food 2482# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2141 my $ycut1 = max 0, min 1, $ycut; 2542 my $ycut1 = max 0, min 1, $ycut;
2142 my $ycut2 = max 0, min 1, $ycut - 1; 2543 my $ycut2 = max 0, min 1, $ycut - 1;
2143 2544
2144 my $h1 = $self->{h} * (1 - $ycut1); 2545 my $h1 = $self->{h} * (1 - $ycut1);
2145 my $h2 = $self->{h} * (1 - $ycut2); 2546 my $h2 = $self->{h} * (1 - $ycut2);
2547 my $h3 = $self->{h};
2548
2549 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2146 2550
2147 glEnable GL_BLEND; 2551 glEnable GL_BLEND;
2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2552 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2553 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2150 glEnable GL_TEXTURE_2D; 2554 glEnable GL_TEXTURE_2D;
… …
2169 2573
2170 if ($t3) { 2574 if ($t3) {
2171 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2575 glBindTexture GL_TEXTURE_2D, $t3->{name};
2172 glBegin GL_QUADS; 2576 glBegin GL_QUADS;
2173 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2577 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2174 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2578 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2175 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2579 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2176 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2580 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2177 glEnd; 2581 glEnd;
2178 } 2582 }
2179 2583
2180 glDisable GL_BLEND; 2584 glDisable GL_BLEND;
2181 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2182} 2586}
2183 2587
2184############################################################################# 2588#############################################################################
2185 2589
2186package CFClient::UI::Gauge; 2590package CFPlus::UI::Gauge;
2187 2591
2188our @ISA = CFClient::UI::VBox::; 2592our @ISA = CFPlus::UI::VBox::;
2189 2593
2190sub new { 2594sub new {
2191 my ($class, %arg) = @_; 2595 my ($class, %arg) = @_;
2192 2596
2193 my $self = $class->SUPER::new ( 2597 my $self = $class->SUPER::new (
… …
2195 can_hover => 1, 2599 can_hover => 1,
2196 can_events => 1, 2600 can_events => 1,
2197 %arg, 2601 %arg,
2198 ); 2602 );
2199 2603
2200 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2604 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2201 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2605 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2202 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2606 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2203 2607
2204 $self 2608 $self
2205} 2609}
2206 2610
2207sub set_fontsize { 2611sub set_fontsize {
… …
2228 $self->{value}->set_text ($val); 2632 $self->{value}->set_text ($val);
2229} 2633}
2230 2634
2231############################################################################# 2635#############################################################################
2232 2636
2233package CFClient::UI::Slider; 2637package CFPlus::UI::Slider;
2234 2638
2235use strict; 2639use strict;
2236 2640
2237use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2238 2642
2239our @ISA = CFClient::UI::DrawBG::; 2643our @ISA = CFPlus::UI::DrawBG::;
2240 2644
2241my @tex = 2645my @tex =
2242 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2243 qw(s1_slider.png s1_slider_bg.png); 2647 qw(s1_slider.png s1_slider_bg.png);
2244 2648
2245sub new { 2649sub new {
2246 my $class = shift; 2650 my $class = shift;
2247 2651
… …
2268 $self->update; 2672 $self->update;
2269 2673
2270 $self 2674 $self
2271} 2675}
2272 2676
2273sub changed { }
2274
2275sub set_range { 2677sub set_range {
2276 my ($self, $range) = @_; 2678 my ($self, $range) = @_;
2277 2679
2278 ($range, $self->{range}) = ($self->{range}, $range); 2680 ($range, $self->{range}) = ($self->{range}, $range);
2279 2681
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}"; 2682 if ("@$range" ne "@{$self->{range}}") {
2683 $self->update;
2684 $self->set_value ($self->{range}[0]);
2685 }
2282} 2686}
2283 2687
2284sub set_value { 2688sub set_value {
2285 my ($self, $value) = @_; 2689 my ($self, $value) = @_;
2286 2690
… …
2297 if $unit; 2701 if $unit;
2298 2702
2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2703 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2300 2704
2301 if ($value != $old_value) { 2705 if ($value != $old_value) {
2302 $self->_emit (changed => $value); 2706 $self->emit (changed => $value);
2303 $self->update; 2707 $self->update;
2304 } 2708 }
2305} 2709}
2306 2710
2307sub size_request { 2711sub size_request {
2308 my ($self) = @_; 2712 my ($self) = @_;
2309 2713
2310 ($self->{req_w}, $self->{req_h}) 2714 ($self->{req_w}, $self->{req_h})
2311} 2715}
2312 2716
2313sub button_down { 2717sub invoke_button_down {
2314 my ($self, $ev, $x, $y) = @_; 2718 my ($self, $ev, $x, $y) = @_;
2315 2719
2316 $self->SUPER::button_down ($ev, $x, $y); 2720 $self->SUPER::invoke_button_down ($ev, $x, $y);
2317 2721
2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2722 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319 2723
2320 $self->mouse_motion ($ev, $x, $y) 2724 $self->invoke_mouse_motion ($ev, $x, $y)
2321} 2725}
2322 2726
2323sub mouse_motion { 2727sub invoke_mouse_motion {
2324 my ($self, $ev, $x, $y) = @_; 2728 my ($self, $ev, $x, $y) = @_;
2325 2729
2326 if ($GRAB == $self) { 2730 if ($GRAB == $self) {
2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2731 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2328 2732
… …
2334 } else { 2738 } else {
2335 return 0; 2739 return 0;
2336 } 2740 }
2337 2741
2338 1 2742 1
2743}
2744
2745sub invoke_mouse_wheel {
2746 my ($self, $ev) = @_;
2747
2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2749
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751
2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753
2754 ! ! $delta
2339} 2755}
2340 2756
2341sub update { 2757sub update {
2342 my ($self) = @_; 2758 my ($self) = @_;
2343 2759
… …
2392 glDisable GL_TEXTURE_2D; 2808 glDisable GL_TEXTURE_2D;
2393} 2809}
2394 2810
2395############################################################################# 2811#############################################################################
2396 2812
2397package CFClient::UI::ValSlider; 2813package CFPlus::UI::ValSlider;
2398 2814
2399our @ISA = CFClient::UI::HBox::; 2815our @ISA = CFPlus::UI::HBox::;
2400 2816
2401sub new { 2817sub new {
2402 my ($class, %arg) = @_; 2818 my ($class, %arg) = @_;
2403 2819
2404 my $range = delete $arg{range}; 2820 my $range = delete $arg{range};
2405 2821
2406 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2407 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2823 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2408 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2824 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2409 to_value => sub { shift }, 2825 to_value => sub { shift },
2410 from_value => sub { shift }, 2826 from_value => sub { shift },
2411 %arg, 2827 %arg,
2412 ); 2828 );
2413 2829
… …
2433sub set_range { shift->{slider}->set_range (@_) } 2849sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) } 2850sub set_value { shift->{slider}->set_value (@_) }
2435 2851
2436############################################################################# 2852#############################################################################
2437 2853
2438package CFClient::UI::TextView; 2854package CFPlus::UI::TextScroller;
2439 2855
2440our @ISA = CFClient::UI::HBox::; 2856our @ISA = CFPlus::UI::HBox::;
2441 2857
2442use CFClient::OpenGL; 2858use CFPlus::OpenGL;
2443 2859
2444sub new { 2860sub new {
2445 my $class = shift; 2861 my $class = shift;
2446 2862
2447 my $self = $class->SUPER::new ( 2863 my $self = $class->SUPER::new (
2448 fontsize => 1, 2864 fontsize => 1,
2449 can_events => 0, 2865 can_events => 1,
2866 indent => 0,
2450 #font => default_font 2867 #font => default_font
2451 @_, 2868 @_,
2452 2869
2453 layout => (new CFClient::Layout 1), 2870 layout => (new CFPlus::Layout),
2454 par => [], 2871 par => [],
2872 max_par => 0,
2455 height => 0, 2873 height => 0,
2456 children => [ 2874 children => [
2457 (new CFClient::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2458 (new CFClient::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2459 ], 2877 ],
2460 ); 2878 );
2461 2879
2462 $self->{children}[1]->connect (changed => sub { $self->update }); 2880 $self->{children}[1]->connect (changed => sub { $self->update });
2463 2881
… …
2469 2887
2470 $self->{fontsize} = $fontsize; 2888 $self->{fontsize} = $fontsize;
2471 $self->reflow; 2889 $self->reflow;
2472} 2890}
2473 2891
2892sub size_request {
2893 my ($self) = @_;
2894
2895 my ($empty, $slider) = @{ $self->{children} };
2896
2897 local $self->{children} = [$empty, $slider];
2898 $self->SUPER::size_request
2899}
2900
2474sub size_allocate { 2901sub invoke_size_allocate {
2475 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2476 2903
2477 $self->SUPER::size_allocate ($w, $h); 2904 my ($empty, $slider, @other) = @{ $self->{children} };
2905 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2478 2906
2479 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2907 $self->{layout}->set_font ($self->{font}) if $self->{font};
2480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2908 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2481 $self->{layout}->set_width ($self->{children}[0]{w}); 2909 $self->{layout}->set_width ($empty->{w});
2910 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2482 2911
2483 $self->reflow; 2912 $self->reflow;
2484}
2485 2913
2486sub text_size { 2914 local $self->{children} = [$empty, $slider];
2915 $self->SUPER::invoke_size_allocate ($w, $h)
2916}
2917
2918sub invoke_mouse_wheel {
2487 my ($self, $text, $indent) = @_; 2919 my ($self, $ev) = @_;
2920
2921 return 0 unless $ev->{dy}; # only vertical movements
2922
2923 $self->{children}[1]->emit (mouse_wheel => $ev);
2924
2925 1
2926}
2927
2928sub get_layout {
2929 my ($self, $para) = @_;
2488 2930
2489 my $layout = $self->{layout}; 2931 my $layout = $self->{layout};
2490 2932
2933 $layout->set_font ($self->{font}) if $self->{font};
2934 $layout->set_foreground (@{$para->{fg}});
2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2935 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492 $layout->set_width ($self->{children}[0]{w} - $indent); 2936 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2937 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2493 $layout->set_markup ($text); 2938 $layout->set_markup ($para->{markup});
2939
2940 $layout->set_shapes (
2941 map
2942 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2943 @{$para->{widget}}
2494 2944 );
2945
2495 $layout->size 2946 $layout
2496} 2947}
2497 2948
2498sub reflow { 2949sub reflow {
2499 my ($self) = @_; 2950 my ($self) = @_;
2500 2951
… …
2507 2958
2508 # todo: base offset on lines or so, not on pixels 2959 # todo: base offset on lines or so, not on pixels
2509 $self->{children}[1]->set_value ($offset); 2960 $self->{children}[1]->set_value ($offset);
2510} 2961}
2511 2962
2963sub current_paragraph {
2964 my ($self) = @_;
2965
2966 $self->{top_paragraph} - 1
2967}
2968
2969sub scroll_to {
2970 my ($self, $para) = @_;
2971
2972 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2973
2974 $self->{scroll_to} = $para;
2975 $self->update;
2976}
2977
2512sub clear { 2978sub clear {
2513 my ($self) = @_; 2979 my ($self) = @_;
2980
2981 my (undef, undef, @other) = @{ $self->{children} };
2982 $self->remove ($_) for @other;
2514 2983
2515 $self->{par} = []; 2984 $self->{par} = [];
2516 $self->{height} = 0; 2985 $self->{height} = 0;
2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2986 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2518} 2987}
2519 2988
2520sub add_paragraph { 2989sub add_paragraph {
2521 my ($self, $color, $text, $indent) = @_; 2990 my $self = shift;
2522 2991
2523 for my $line (split /\n/, $text) { 2992 for my $para (@_) {
2524 my ($w, $h) = $self->text_size ($line); 2993 $para = {
2994 fg => [1, 1, 1, 1],
2995 indent => 0,
2996 markup => "",
2997 widget => [],
2998 ref $para ? %$para : (markup => $para),
2999 w => 1e10,
3000 wrapped => 1,
3001 };
3002
3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3004 push @{$self->{par}}, $para;
3005 }
3006
3007 if (my $max = $self->{max_par}) {
3008 shift @{$self->{par}} while @{$self->{par}} > $max;
3009 }
3010
3011 $self->{need_reflow}++;
3012 $self->update;
3013}
3014
3015sub scroll_to_bottom {
3016 my ($self) = @_;
3017
3018 $self->{scroll_to} = $#{$self->{par}};
3019 $self->update;
3020}
3021
3022sub force_uptodate {
3023 my ($self) = @_;
3024
3025 if (delete $self->{need_reflow}) {
3026 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3027
3028 my $height = 0;
3029
3030 for my $para (@{$self->{par}}) {
3031 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3032 my $layout = $self->get_layout ($para);
3033 my ($w, $h) = $layout->size;
3034
3035 $para->{w} = $w + $para->{indent};
3036 $para->{h} = $h;
3037 $para->{wrapped} = $layout->has_wrapped;
3038 }
3039
3040 $para->{y} = $height;
3041 $height += $para->{h};
3042 }
3043
2525 $self->{height} += $h; 3044 $self->{height} = $height;
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2527 }
2528 3046
2529 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3047 delete $self->{texture};
3048 }
3049
3050 if (my $paridx = delete $self->{scroll_to}) {
3051 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3052 }
2530} 3053}
2531 3054
2532sub update { 3055sub update {
2533 my ($self) = @_; 3056 my ($self) = @_;
2534 3057
… …
2536 3059
2537 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2538 3061
2539 delete $self->{texture}; 3062 delete $self->{texture};
2540 3063
2541 $ROOT->on_post_alloc ($self, sub { 3064 $ROOT->on_post_alloc ($self => sub {
3065 $self->force_uptodate;
3066
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543 3068
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 { 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2571 glClearColor 0, 0, 0, 0; 3070 glClearColor 0, 0, 0, 0;
2572 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2573 3072
3073 package CFPlus::UI::Base;
3074 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3075 (0, 0, $self->{w}, $self->{h});
3076
3077 my $top = int $self->{children}[1]{range}[0];
3078
3079 my $paridx = 0;
3080 my $top_paragraph;
2574 my $top = int $self->{children}[1]{range}[0]; 3081 my $top = int $self->{children}[1]{range}[0];
2575 3082
2576 my $y0 = $top; 3083 my $y0 = $top;
2577 my $y1 = $top + $H; 3084 my $y1 = $top + $H;
2578 3085
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}}) { 3086 for my $para (@{$self->{par}}) {
2590 my $h = $par->[1]; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2591 3089
2592 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2593 $layout->set_foreground (@{ $par->[2] }); 3091 my $layout = $self->get_layout ($para);
2594 $layout->set_width ($W - $par->[3]);
2595 $layout->set_markup ($par->[4]);
2596 3092
2597 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3093 $layout->render ($para->{indent}, $y - $y0);
2598 3094
2599 glRasterPos $par->[3], $y - $y0; 3095 if (my @w = @{ $para->{widget} }) {
2600 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3096 my @s = $layout->get_shapes;
3097
3098 for (@w) {
3099 my ($dx, $dy) = splice @s, 0, 2, ();
3100
3101 $_->{x} = $dx + $para->{indent};
3102 $_->{y} = $dy + $y - $y0;
3103
3104 $_->draw;
3105 }
3106 }
2601 } 3107 }
2602 3108
2603 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2604 } 3111 }
2605 3112
2606 glDisable GL_BLEND; 3113 $self->{top_paragraph} = $top_paragraph;
2607 }; 3114 };
2608 }); 3115 });
3116}
3117
3118sub reconfigure {
3119 my ($self) = @_;
3120
3121 $self->SUPER::reconfigure;
3122
3123 $_->{w} = 1e10 for @{ $self->{par} };
3124 $self->reflow;
2609} 3125}
2610 3126
2611sub _draw { 3127sub _draw {
2612 my ($self) = @_; 3128 my ($self) = @_;
2613 3129
… …
2616 glColor 0, 0, 0, 1; 3132 glColor 0, 0, 0, 1;
2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3133 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2618 glDisable GL_TEXTURE_2D; 3134 glDisable GL_TEXTURE_2D;
2619 3135
2620 $self->{children}[1]->draw; 3136 $self->{children}[1]->draw;
2621
2622} 3137}
2623 3138
2624############################################################################# 3139#############################################################################
2625 3140
2626package CFClient::UI::Animator; 3141package CFPlus::UI::Animator;
2627 3142
2628use CFClient::OpenGL; 3143use CFPlus::OpenGL;
2629 3144
2630our @ISA = CFClient::UI::Bin::; 3145our @ISA = CFPlus::UI::Bin::;
2631 3146
2632sub moveto { 3147sub moveto {
2633 my ($self, $x, $y) = @_; 3148 my ($self, $x, $y) = @_;
2634 3149
2635 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2663 glPopMatrix; 3178 glPopMatrix;
2664} 3179}
2665 3180
2666############################################################################# 3181#############################################################################
2667 3182
2668package CFClient::UI::Flopper; 3183package CFPlus::UI::Flopper;
2669 3184
2670our @ISA = CFClient::UI::Button::; 3185our @ISA = CFPlus::UI::Button::;
2671 3186
2672sub new { 3187sub new {
2673 my $class = shift; 3188 my $class = shift;
2674 3189
2675 my $self = $class->SUPER::new ( 3190 my $self = $class->SUPER::new (
… …
2687 $self->{other}->toggle_visibility; 3202 $self->{other}->toggle_visibility;
2688} 3203}
2689 3204
2690############################################################################# 3205#############################################################################
2691 3206
2692package CFClient::UI::Tooltip; 3207package CFPlus::UI::Tooltip;
2693 3208
2694our @ISA = CFClient::UI::Bin::; 3209our @ISA = CFPlus::UI::Bin::;
2695 3210
2696use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2697 3212
2698sub new { 3213sub new {
2699 my $class = shift; 3214 my $class = shift;
2700 3215
2701 $class->SUPER::new ( 3216 $class->SUPER::new (
… …
2704 ) 3219 )
2705} 3220}
2706 3221
2707sub set_tooltip_from { 3222sub set_tooltip_from {
2708 my ($self, $widget) = @_; 3223 my ($self, $widget) = @_;
3224
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
2709 3227
2710 my $tooltip = $widget->{tooltip}; 3228 my $tooltip = $widget->{tooltip};
2711 3229
2712 if ($ENV{CFPLUS_DEBUG} & 2) { 3230 if ($ENV{CFPLUS_DEBUG} & 2) {
2713 $tooltip .= "\n\n" . (ref $widget) . "\n" 3231 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3232 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n" 3233 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}"; 3234 . "visible $widget->{visible}";
2717 } 3235 }
2718 3236
3237 $tooltip =~ s/^\n+//;
3238 $tooltip =~ s/\n+$//;
3239
2719 $self->add (new CFClient::UI::Label 3240 $self->add (new CFPlus::UI::Label
2720 markup => $tooltip, 3241 markup => $tooltip,
2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2722 fontsize => 0.8, 3243 fontsize => 0.8,
2723 fg => [0, 0, 0, 1], 3244 style => 1, # FLAG_INVERSE
2724 ellipsise => 0, 3245 ellipsise => 0,
2725 font => ($widget->{tooltip_font} || $::FONT_PROP), 3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
2726 ); 3247 );
2727} 3248}
2728 3249
… …
2732 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3253 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2733 3254
2734 ($w + 4, $h + 4) 3255 ($w + 4, $h + 4)
2735} 3256}
2736 3257
2737sub size_allocate { 3258sub invoke_size_allocate {
2738 my ($self, $w, $h) = @_; 3259 my ($self, $w, $h) = @_;
2739 3260
2740 $self->SUPER::size_allocate ($w - 4, $h - 4); 3261 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2741} 3262}
2742 3263
2743sub visibility_change { 3264sub invoke_visibility_change {
2744 my ($self, $visible) = @_; 3265 my ($self, $visible) = @_;
2745 3266
2746 return unless $visible; 3267 return unless $visible;
2747 3268
2748 $self->{root}->on_post_alloc ("move_$self" => sub { 3269 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner} 3270 my $widget = $self->{owner}
2750 or return; 3271 or return;
2751 3272
3273 if ($widget->{visible}) {
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3274 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753 3275
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3276 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH; 3277 if $x + $self->{w} > $self->{root}{w};
2756 3278
2757 $self->move_abs ($x, $y); 3279 $self->move_abs ($x, $y);
3280 } else {
3281 $self->hide;
3282 }
2758 }); 3283 });
2759} 3284}
2760 3285
2761sub _draw { 3286sub _draw {
2762 my ($self) = @_; 3287 my ($self) = @_;
… …
2786 $self->SUPER::_draw; 3311 $self->SUPER::_draw;
2787} 3312}
2788 3313
2789############################################################################# 3314#############################################################################
2790 3315
2791package CFClient::UI::Face; 3316package CFPlus::UI::Face;
2792 3317
2793our @ISA = CFClient::UI::Base::; 3318our @ISA = CFPlus::UI::DrawBG::;
2794 3319
2795use CFClient::OpenGL; 3320use CFPlus::OpenGL;
2796 3321
2797sub new { 3322sub new {
2798 my $class = shift; 3323 my $class = shift;
2799 3324
2800 my $self = $class->SUPER::new ( 3325 my $self = $class->SUPER::new (
… …
2802 can_events => 0, 3327 can_events => 0,
2803 @_, 3328 @_,
2804 ); 3329 );
2805 3330
2806 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
2807 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
2808 3333
2809 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
2810 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2811 hard => 1, 3336 hard => 1,
2812 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
2813 cb => sub { 3338 cb => sub {
3339 delete $self->{wait_face};
2814 ++$widget->{frame}; 3340 ++$widget->{frame};
2815 $widget->update; 3341 $widget->update;
2816 }, 3342 },
2817 ); 3343 );
2818 } 3344 }
… …
2835sub _draw { 3361sub _draw {
2836 my ($self) = @_; 3362 my ($self) = @_;
2837 3363
2838 return unless $::CONN; 3364 return unless $::CONN;
2839 3365
3366 $self->SUPER::_draw;
3367
2840 my $face; 3368 my $face;
2841 3369
2842 if ($self->{frame}) { 3370 if ($self->{frame}) {
2843 my $anim = $::CONN->{anim}[$self->{anim}]; 3371 my $anim = $::CONN->{anim}[$self->{anim}];
2844 3372
2845 $face = $anim->[ $self->{frame} % @$anim ] 3373 $face = $anim->[ $self->{frame} % @$anim ]
2846 if $anim && @$anim; 3374 if $anim && @$anim;
2847 } 3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
2848 3379
2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3380 my $tex = $::CONN->{texture}[$faceid];
2850 3381
2851 if ($tex) { 3382 if ($tex) {
2852 glEnable GL_TEXTURE_2D; 3383 glEnable GL_TEXTURE_2D;
2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2854 glColor 0, 0, 0, 1; 3385 glColor 0, 0, 0, 1;
2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2856 glDisable GL_TEXTURE_2D; 3387 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
2857 } 3392 }
2858} 3393}
2859 3394
2860sub DESTROY { 3395sub destroy {
2861 my ($self) = @_; 3396 my ($self) = @_;
2862 3397
2863 $self->{timer}->cancel 3398 $self->{timer}->cancel
2864 if $self->{timer}; 3399 if $self->{timer};
2865 3400
2866 $self->SUPER::DESTROY; 3401 $self->SUPER::destroy;
2867} 3402}
2868 3403
2869############################################################################# 3404#############################################################################
2870 3405
2871package CFClient::UI::Buttonbar; 3406package CFPlus::UI::Buttonbar;
2872 3407
2873our @ISA = CFClient::UI::HBox::; 3408our @ISA = CFPlus::UI::HBox::;
2874 3409
2875# TODO: should actualyl wrap buttons and other goodies. 3410# TODO: should actually wrap buttons and other goodies.
2876 3411
2877############################################################################# 3412#############################################################################
2878 3413
2879package CFClient::UI::Menu; 3414package CFPlus::UI::Menu;
2880 3415
2881our @ISA = CFClient::UI::FancyFrame::; 3416our @ISA = CFPlus::UI::Toplevel::;
2882 3417
2883use CFClient::OpenGL; 3418use CFPlus::OpenGL;
2884 3419
2885sub new { 3420sub new {
2886 my $class = shift; 3421 my $class = shift;
2887 3422
2888 my $self = $class->SUPER::new ( 3423 my $self = $class->SUPER::new (
2889 items => [], 3424 items => [],
2890 z => 100, 3425 z => 100,
2891 @_, 3426 @_,
2892 ); 3427 );
2893 3428
2894 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3429 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2895 3430
2896 for my $item (@{ $self->{items} }) { 3431 for my $item (@{ $self->{items} }) {
2897 my ($widget, $cb) = @$item; 3432 my ($widget, $cb, $tooltip) = @$item;
2898 3433
2899 # handle various types of items, only text for now 3434 # handle various types of items, only text for now
2900 if (!ref $widget) { 3435 if (!ref $widget) {
3436 if ($widget =~ /\t/) {
3437 my ($left, $right) = split /\t/, $widget, 2;
3438
2901 $widget = new CFClient::UI::Label 3439 $widget = new CFPlus::UI::HBox
2902 can_hover => 1, 3440 can_hover => 1,
2903 can_events => 1, 3441 can_events => 1,
3442 tooltip => $tooltip,
3443 children => [
3444 (new CFPlus::UI::Label markup => $left, expand => 1),
3445 (new CFPlus::UI::Label markup => $right, align => +1),
3446 ],
3447 ;
3448
3449 } else {
3450 $widget = new CFPlus::UI::Label
3451 can_hover => 1,
3452 can_events => 1,
2904 text => $widget; 3453 markup => $widget,
3454 tooltip => $tooltip;
3455 }
2905 } 3456 }
2906 3457
2907 $self->{item}{$widget} = $item; 3458 $self->{item}{$widget} = $item;
2908 3459
2909 $self->{vbox}->add ($widget); 3460 $self->{vbox}->add ($widget);
… …
2914 3465
2915# popup given the event (must be a mouse button down event currently) 3466# popup given the event (must be a mouse button down event currently)
2916sub popup { 3467sub popup {
2917 my ($self, $ev) = @_; 3468 my ($self, $ev) = @_;
2918 3469
2919 $self->_emit ("popdown"); 3470 $self->emit ("popdown");
2920 3471
2921 # maybe save $GRAB? must be careful about events... 3472 # maybe save $GRAB? must be careful about events...
2922 $GRAB = $self; 3473 $GRAB = $self;
2923 $self->{button} = $ev->{button}; 3474 $self->{button} = $ev->{button};
2924 3475
2925 $self->show; 3476 $self->show;
2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3477 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2927} 3478}
2928 3479
2929sub mouse_motion { 3480sub invoke_mouse_motion {
2930 my ($self, $ev, $x, $y) = @_; 3481 my ($self, $ev, $x, $y) = @_;
2931 3482
2932 # TODO: should use vbox->find_widget or so 3483 # TODO: should use vbox->find_widget or so
2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3484 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2934 $self->{hover} = $self->{item}{$HOVER}; 3485 $self->{hover} = $self->{item}{$HOVER};
2935 3486
2936 0 3487 0
2937} 3488}
2938 3489
2939sub button_up { 3490sub invoke_button_up {
2940 my ($self, $ev, $x, $y) = @_; 3491 my ($self, $ev, $x, $y) = @_;
2941 3492
2942 if ($ev->{button} == $self->{button}) { 3493 if ($ev->{button} == $self->{button}) {
2943 undef $GRAB; 3494 undef $GRAB;
2944 $self->hide; 3495 $self->hide;
2945 3496
2946 $self->_emit ("popdown"); 3497 $self->emit ("popdown");
2947 $self->{hover}[1]->() if $self->{hover}; 3498 $self->{hover}[1]->() if $self->{hover};
2948 } else { 3499 } else {
2949 return 0 3500 return 0
2950 } 3501 }
2951 3502
2952 1 3503 1
2953} 3504}
2954 3505
2955############################################################################# 3506#############################################################################
2956 3507
2957package CFClient::UI::Multiplexer; 3508package CFPlus::UI::Multiplexer;
2958 3509
2959our @ISA = CFClient::UI::Container::; 3510our @ISA = CFPlus::UI::Container::;
2960 3511
2961sub new { 3512sub new {
2962 my $class = shift; 3513 my $class = shift;
2963 3514
2964 my $self = $class->SUPER::new ( 3515 my $self = $class->SUPER::new (
… …
2978 3529
2979 $self->{current} = $self->{children}[0] 3530 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} }; 3531 if @{ $self->{children} };
2981} 3532}
2982 3533
3534sub get_current_page {
3535 my ($self) = @_;
3536
3537 $self->{current}
3538}
3539
2983sub set_current_page { 3540sub set_current_page {
2984 my ($self, $page_or_widget) = @_; 3541 my ($self, $page_or_widget) = @_;
2985 3542
2986 my $widget = ref $page_or_widget 3543 my $widget = ref $page_or_widget
2987 ? $page_or_widget 3544 ? $page_or_widget
2988 : $self->{children}[$page_or_widget]; 3545 : $self->{children}[$page_or_widget];
2989 3546
2990 $self->{current} = $widget; 3547 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3548 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992 3549
2993 $self->_emit (page_changed => $self->{current}); 3550 $self->emit (page_changed => $self->{current});
2994 3551
2995 $self->realloc; 3552 $self->realloc;
2996} 3553}
2997 3554
2998sub visible_children { 3555sub visible_children {
… …
3003 my ($self) = @_; 3560 my ($self) = @_;
3004 3561
3005 $self->{current}->size_request 3562 $self->{current}->size_request
3006} 3563}
3007 3564
3008sub size_allocate { 3565sub invoke_size_allocate {
3009 my ($self, $w, $h) = @_; 3566 my ($self, $w, $h) = @_;
3010 3567
3011 $self->{current}->configure (0, 0, $w, $h); 3568 $self->{current}->configure (0, 0, $w, $h);
3569
3570 1
3012} 3571}
3013 3572
3014sub _draw { 3573sub _draw {
3015 my ($self) = @_; 3574 my ($self) = @_;
3016 3575
3017 $self->{current}->draw; 3576 $self->{current}->draw;
3018} 3577}
3019 3578
3020############################################################################# 3579#############################################################################
3021 3580
3022package CFClient::UI::Notebook; 3581package CFPlus::UI::Notebook;
3023 3582
3024our @ISA = CFClient::UI::VBox::; 3583our @ISA = CFPlus::UI::VBox::;
3025 3584
3026sub new { 3585sub new {
3027 my $class = shift; 3586 my $class = shift;
3028 3587
3029 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar), 3589 buttonbar => (new CFPlus::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3590 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3032 # filter => # will be put between multiplexer and $self 3591 # filter => # will be put between multiplexer and $self
3033 @_, 3592 @_,
3034 ); 3593 );
3035 3594
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3595 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3040} 3599}
3041 3600
3042sub add { 3601sub add {
3043 my ($self, $title, $widget, $tooltip) = @_; 3602 my ($self, $title, $widget, $tooltip) = @_;
3044 3603
3045 Scalar::Util::weaken $self; 3604 CFPlus::weaken $self;
3046 3605
3047 $self->{buttonbar}->add (new CFClient::UI::Button 3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3048 markup => $title, 3607 markup => $title,
3049 tooltip => $tooltip, 3608 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) }, 3609 on_activate => sub { $self->set_current_page ($widget) },
3051 ); 3610 );
3052 3611
3053 $self->{multiplexer}->add ($widget); 3612 $self->{multiplexer}->add ($widget);
3054} 3613}
3055 3614
3615sub get_current_page {
3616 my ($self) = @_;
3617
3618 $self->{multiplexer}->get_current_page
3619}
3620
3056sub set_current_page { 3621sub set_current_page {
3057 my ($self, $page) = @_; 3622 my ($self, $page) = @_;
3058 3623
3059 $self->{multiplexer}->set_current_page ($page); 3624 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current}); 3625 $self->emit (page_changed => $self->{multiplexer}{current});
3061} 3626}
3062 3627
3063############################################################################# 3628#############################################################################
3064 3629
3065package CFClient::UI::Statusbox; 3630package CFPlus::UI::Selector;
3066 3631
3632use utf8;
3633
3067our @ISA = CFClient::UI::VBox::; 3634our @ISA = CFPlus::UI::Button::;
3068 3635
3069sub new { 3636sub new {
3070 my $class = shift; 3637 my $class = shift;
3071 3638
3072 $class->SUPER::new ( 3639 my $self = $class->SUPER::new (
3640 options => [], # [value, title, longdesc], ...
3641 value => undef,
3642 @_,
3643 );
3644
3645 $self->_set_value ($self->{value});
3646
3647 $self
3648}
3649
3650sub invoke_button_down {
3651 my ($self, $ev) = @_;
3652
3653 my @menu_items;
3654
3655 for (@{ $self->{options} }) {
3656 my ($value, $title, $tooltip) = @$_;
3657
3658 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3659 }
3660
3661 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3662}
3663
3664sub _set_value {
3665 my ($self, $value) = @_;
3666
3667 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3668 or return;
3669
3670 $self->{value} = $item->[0];
3671 $self->set_markup ("$item->[1] ⇓");
3672 $self->set_tooltip ($item->[2]);
3673}
3674
3675sub set_value {
3676 my ($self, $value) = @_;
3677
3678 return unless $self->{value} ne $value;
3679
3680 $self->_set_value ($value);
3681 $self->emit (changed => $value);
3682}
3683
3684#############################################################################
3685
3686package CFPlus::UI::Statusbox;
3687
3688our @ISA = CFPlus::UI::VBox::;
3689
3690sub new {
3691 my $class = shift;
3692
3693 my $self = $class->SUPER::new (
3073 fontsize => 0.8, 3694 fontsize => 0.8,
3074 @_, 3695 @_,
3075 ) 3696 );
3697
3698 CFPlus::weaken (my $this = $self);
3699
3700 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3701
3702 $self
3076} 3703}
3077 3704
3078sub reorder { 3705sub reorder {
3079 my ($self) = @_; 3706 my ($self) = @_;
3080 my $NOW = time; 3707 my $NOW = Time::HiRes::time;
3708
3709 # freeze display when hovering over any label
3710 return if $CFPlus::UI::TOOLTIP->{owner}
3711 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3712 values %{ $self->{item} };
3081 3713
3082 while (my ($k, $v) = each %{ $self->{item} }) { 3714 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3715 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 } 3716 }
3085 3717
… …
3088 my @items = sort { 3720 my @items = sort {
3089 $a->{pri} <=> $b->{pri} 3721 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id} 3722 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} }; 3723 } values %{ $self->{item} };
3092 3724
3725 $self->{timer}->interval (1);
3726
3093 my $count = 10 + 1; 3727 my $count = 10 + 1;
3094 for my $item (@items) { 3728 for my $item (@items) {
3095 last unless --$count; 3729 last unless --$count;
3096 3730
3097 push @widgets, $item->{label} ||= do { 3731 my $label = $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all) 3732 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1 3733 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}" 3734 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text}; 3735 : $item->{text};
3102 3736
3103 for ($short) { 3737 for ($short) {
3104 s/^\s+//; 3738 s/^\s+//;
3105 s/\s+/ /g; 3739 s/\s+/ /g;
3106 } 3740 }
3107 3741
3108 new CFClient::UI::Label 3742 new CFPlus::UI::Label
3109 markup => $short, 3743 markup => $short,
3110 tooltip => $item->{tooltip}, 3744 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP, 3745 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67, 3746 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize}, 3747 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44, 3748 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg}, 3749 fg => [@{ $item->{fg} }],
3116 can_events => 1, 3750 can_events => 1,
3117 can_hover => 1 3751 can_hover => 1
3118 }; 3752 };
3753
3754 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3755 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3756 $label->update;
3757 $label->set_max_size (undef, $label->{req_h} * $diff)
3758 if $diff < 1;
3759 $self->{timer}->interval (1/30);
3760 } else {
3761 $label->{fg}[3] = $item->{fg}[3] || 1;
3762 }
3763
3764 push @widgets, $label;
3119 } 3765 }
3120 3766
3121 $self->clear; 3767 $self->clear;
3122 $self->SUPER::add (reverse @widgets); 3768 $self->SUPER::add (reverse @widgets);
3123} 3769}
… …
3128 $text =~ s/^\s+//; 3774 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//; 3775 $text =~ s/\s+$//;
3130 3776
3131 return unless $text; 3777 return unless $text;
3132 3778
3133 my $timeout = time + ((delete $arg{timeout}) || 60); 3779 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134 3780
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3781 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136 3782
3137 if (my $item = $self->{item}{$group}) { 3783 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) { 3784 if ($item->{text} eq $text) {
3139 $item->{count}++; 3785 $item->{count}++;
3140 } else { 3786 } else {
3141 $item->{count} = 1; 3787 $item->{count} = 1;
3142 $item->{text} = $item->{tooltip} = $text; 3788 $item->{text} = $item->{tooltip} = $text;
3143 } 3789 }
3144 $item->{id} = ++$self->{id}; 3790 $item->{id} += 0.2;#d#
3145 $item->{timeout} = $timeout; 3791 $item->{timeout} = $timeout;
3146 delete $item->{label}; 3792 delete $item->{label};
3147 } else { 3793 } else {
3148 $self->{item}{$group} = { 3794 $self->{item}{$group} = {
3149 id => ++$self->{id}, 3795 id => ++$self->{id},
… …
3155 count => 1, 3801 count => 1,
3156 %arg, 3802 %arg,
3157 }; 3803 };
3158 } 3804 }
3159 3805
3806 $ROOT->on_refresh (reorder => sub {
3160 $self->reorder; 3807 $self->reorder;
3808 });
3161} 3809}
3162 3810
3163sub reconfigure { 3811sub reconfigure {
3164 my ($self) = @_; 3812 my ($self) = @_;
3165 3813
… …
3168 3816
3169 $self->reorder; 3817 $self->reorder;
3170 $self->SUPER::reconfigure; 3818 $self->SUPER::reconfigure;
3171} 3819}
3172 3820
3821sub destroy {
3822 my ($self) = @_;
3823
3824 $self->{timer}->cancel;
3825
3826 $self->SUPER::destroy;
3827}
3828
3173############################################################################# 3829#############################################################################
3174 3830
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; 3831package CFPlus::UI::Root;
3471 3832
3472our @ISA = CFClient::UI::Container::; 3833our @ISA = CFPlus::UI::Container::;
3473 3834
3835use List::Util qw(min max);
3836
3474use CFClient::OpenGL; 3837use CFPlus::OpenGL;
3475 3838
3476sub new { 3839sub new {
3477 my $class = shift; 3840 my $class = shift;
3478 3841
3479 my $self = $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3480 visible => 1, 3843 visible => 1,
3481 @_, 3844 @_,
3482 ); 3845 );
3483 3846
3484 Scalar::Util::weaken ($self->{root} = $self); 3847 CFPlus::weaken ($self->{root} = $self);
3485 3848
3486 $self 3849 $self
3487} 3850}
3488 3851
3489sub size_request { 3852sub size_request {
… …
3504 $coord = $max - $size if $coord > $max - $size; 3867 $coord = $max - $size if $coord > $max - $size;
3505 3868
3506 int $coord + 0.5 3869 int $coord + 0.5
3507} 3870}
3508 3871
3509sub size_allocate { 3872sub invoke_size_allocate {
3510 my ($self, $w, $h) = @_; 3873 my ($self, $w, $h) = @_;
3511 3874
3512 for my $child ($self->children) { 3875 for my $child ($self->children) {
3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3876 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3514 3877
… …
3518 $X = _to_pixel $X, $W, $self->{w}; 3881 $X = _to_pixel $X, $W, $self->{w};
3519 $Y = _to_pixel $Y, $H, $self->{h}; 3882 $Y = _to_pixel $Y, $H, $self->{h};
3520 3883
3521 $child->configure ($X, $Y, $W, $H); 3884 $child->configure ($X, $Y, $W, $H);
3522 } 3885 }
3886
3887 1
3523} 3888}
3524 3889
3525sub coord2local { 3890sub coord2local {
3526 my ($self, $x, $y) = @_; 3891 my ($self, $x, $y) = @_;
3527 3892
… …
3612 3977
3613 delete $queue{$widget+0}; 3978 delete $queue{$widget+0};
3614 3979
3615 my ($w, $h) = $widget->size_request; 3980 my ($w, $h) = $widget->size_request;
3616 3981
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3982 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3983 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3984
3985 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3986 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3619 3987
3620 $w = $widget->{force_w} if exists $widget->{force_w}; 3988 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h}; 3989 $h = $widget->{force_h} if exists $widget->{force_h};
3622 3990
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3991 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3649 4017
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4018 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3651 4019
3652 $w = 0 if $w < 0; 4020 $w = 0 if $w < 0;
3653 $h = 0 if $h < 0; 4021 $h = 0 if $h < 0;
4022
4023 $w = max $widget->{min_w}, $w;
4024 $h = max $widget->{min_h}, $h;
4025
4026# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028
4029 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3654 4031
3655 $w = int $w + 0.5; 4032 $w = int $w + 0.5;
3656 $h = int $h + 0.5; 4033 $h = int $h + 0.5;
3657 4034
3658 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4035 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3683 glMatrixMode GL_MODELVIEW; 4060 glMatrixMode GL_MODELVIEW;
3684 glLoadIdentity; 4061 glLoadIdentity;
3685 4062
3686 { 4063 {
3687 package CFClient::UI::Base; 4064 package CFPlus::UI::Base;
3688 4065
3689 ($draw_x, $draw_y, $draw_w, $draw_h) = 4066 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h}); 4067 (0, 0, $self->{w}, $self->{h});
3691 }
3692 4068
3693 $self->_draw; 4069 $self->_draw;
4070 }
3694} 4071}
3695 4072
3696############################################################################# 4073#############################################################################
3697 4074
3698package CFClient::UI; 4075package CFPlus::UI;
3699 4076
3700$ROOT = new CFClient::UI::Root; 4077$ROOT = new CFPlus::UI::Root;
3701$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4078$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3702 4079
37031 40801
3704 4081

Diff Legend

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