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

Diff Legend

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