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

Diff Legend

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