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.280 by root, Mon Jun 5 01:22:08 2006 UTC vs.
Revision 1.373 by root, Sun Jul 15 22:39:30 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner};
51});
20 52
21sub get_layout { 53sub get_layout {
22 my $layout; 54 my $layout;
23 55
24 for (grep { $_->{name} } values %WIDGET) { 56 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 71 my ($layout) = @_;
40 72
41 $LAYOUT = $layout; 73 $LAYOUT = $layout;
42} 74}
43 75
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 76# class methods for events
73sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 78 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 79 if $FOCUS;
76} 80}
… …
78sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 84 if $FOCUS;
81} 85}
82 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
83sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
84 my ($ev) = @_; 101 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
86 103
87 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
89 108
90 $GRAB = $widget; 109 $GRAB = $widget;
91 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
92 111
93 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
94 } 113 }
95 114
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
97 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
99 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
100} 125}
101 126
102sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
103 my ($ev) = @_; 128 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 129
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 131
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 133
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
111 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 136
113 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 139 $grab->update if $grab;
116 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
117 141
118 check_tooltip; 142 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->();
119 } 144 }
120} 145}
121 146
122sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
123 my ($ev) = @_; 148 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
125 150
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 152
128 if ($widget != $HOVER) { 153 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 154
131 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 156 if $HOVER;
139} 157}
140 158
141# convert position array to integers 159# convert position array to integers
142sub harmonize { 160sub harmonize {
… …
192 reconfigure_widgets; 210 reconfigure_widgets;
193} 211}
194 212
195############################################################################# 213#############################################################################
196 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
197package CFClient::UI::Base; 223package CFPlus::UI::Base;
198 224
199use strict; 225use strict;
200 226
201use CFClient::OpenGL; 227use CFPlus::OpenGL;
202 228
203sub new { 229sub new {
204 my $class = shift; 230 my $class = shift;
205 231
206 my $self = bless { 232 my $self = bless {
… …
211 h => undef, 237 h => undef,
212 can_events => 1, 238 can_events => 1,
213 @_ 239 @_
214 }, $class; 240 }, $class;
215 241
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 243
218 for (keys %$self) { 244 for (keys %$self) {
219 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
221 } 247 }
222 } 248 }
223 249
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 255
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 258
233 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
238 264
239sub destroy { 265sub destroy {
240 my ($self) = @_; 266 my ($self) = @_;
241 267
242 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
243 %$self = (); 270 %$self = ();
244} 271}
245 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
246sub show { 277sub show {
247 my ($self) = @_; 278 my ($self) = @_;
248 279
249 return if $self->{parent}; 280 return if $self->{parent};
250 281
251 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
252} 283}
253 284
254sub set_visible { 285sub set_visible {
255 my ($self) = @_; 286 my ($self) = @_;
256 287
… …
271 302
272 return unless $self->{visible}; 303 return unless $self->{visible};
273 304
274 $_->set_invisible for $self->children; 305 $_->set_invisible for $self->children;
275 306
307 delete $self->{visible};
276 delete $self->{root}; 308 delete $self->{root};
277 delete $self->{visible};
278 309
279 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
281 312
282 CFClient::UI::check_tooltip 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
284 315
285 $self->focus_out; 316 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
289 319
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
314} 344}
315 345
316sub move_abs { 346sub move_abs {
317 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
318 348
319 $self->{x} = List::Util::max 0, int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
322 352
323 $self->update; 353 $self->update;
324} 354}
325 355
… …
335sub size_request { 365sub size_request {
336 require Carp; 366 require Carp;
337 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
338} 368}
339 369
370sub baseline_shift {
371 0
372}
373
340sub configure { 374sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
342 376
343 if ($self->{aspect}) { 377 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
345 379
346 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 382
349 # use alignment to adjust x, y 383 # use alignment to adjust x, y
350 384
351 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
366 400
367 $self->{root}{size_alloc}{$self+0} = $self; 401 $self->{root}{size_alloc}{$self+0} = $self;
368 } 402 }
369} 403}
370 404
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 405sub children {
376 # nop 406 # nop
377} 407}
378 408
379sub visible_children { 409sub visible_children {
… …
381} 411}
382 412
383sub set_max_size { 413sub set_max_size {
384 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
385 415
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 416 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 417 $self->{max_h} = int $h if defined $h;
388 418
389 $self->realloc; 419 $self->realloc;
390} 420}
391 421
392sub set_tooltip { 422sub set_tooltip {
… …
397 427
398 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
399 429
400 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
401 431
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
404 CFClient::UI::check_tooltip; 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 435 }
406} 436}
407 437
408# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
409sub coord2local { 439sub coord2local {
410 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
411 441
442 Carp::confess unless $self->{parent};#d#
443
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 445}
414 446
415# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
416sub coord2global { 448sub coord2global {
417 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
418 450
451 Carp::confess unless $self->{parent};#d#
452
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 454}
421 455
422sub focus_in { 456sub invoke_focus_in {
423 my ($self) = @_; 457 my ($self) = @_;
424 458
425 return if $FOCUS == $self; 459 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
427 461
428 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
429 463
430 $self->_emit (focus_in => $focus); 464 $self->update;
431 465
432 $focus->update if $focus; 466 0
433 $FOCUS->update;
434} 467}
435 468
436sub focus_out { 469sub invoke_focus_out {
437 my ($self) = @_; 470 my ($self) = @_;
438 471
439 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
440 473
441 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
442 475
443 $self->_emit (focus_out => $focus); 476 $self->update;
444 477
445 $focus->update if $focus; #?
446
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448 unless $FOCUS; 479 unless $FOCUS;
449}
450 480
481 0
482}
483
484sub grab_focus {
485 my ($self) = @_;
486
487 $FOCUS->emit ("focus_out") if $FOCUS;
488 $self->emit ("focus_in");
489}
490
451sub mouse_motion { 0 } 491sub invoke_mouse_motion { 0 }
452sub button_up { 0 } 492sub invoke_button_up { 0 }
453sub key_down { 0 } 493sub invoke_key_down { 0 }
454sub key_up { 0 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
455 496
456sub button_down { 497sub invoke_button_down {
457 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
458 499
459 $self->focus_in; 500 $self->grab_focus;
460 501
461 0 502 0
503}
504
505sub connect {
506 my ($self, $signal, $cb) = @_;
507
508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
528
529sub emit {
530 my ($self, $signal, @args) = @_;
531
532 # I do not really like this solution, but I do not like duplication
533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args)
462} 550}
463 551
464sub find_widget { 552sub find_widget {
465 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
466 554
… …
474} 562}
475 563
476sub set_parent { 564sub set_parent {
477 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
478 566
479 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504} 569}
505 570
506sub realloc { 571sub realloc {
507 my ($self) = @_; 572 my ($self) = @_;
508 573
… …
541 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
542 607
543 # update screen rectangle 608 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548 611
549 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552 615
… …
575 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
578 glEnd; 641 glEnd;
579 glPopMatrix; 642 glPopMatrix;
580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581 } 644 }
582 645
583 $self->_draw; 646 $self->_draw;
584 glPopMatrix; 647 glPopMatrix;
585} 648}
… …
588 my ($self) = @_; 651 my ($self) = @_;
589 652
590 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
591} 654}
592 655
656my $cntx;#d#
593sub DESTROY { 657sub DESTROY {
594 my ($self) = @_; 658 my ($self) = @_;
595 659
660 return if CFPlus::in_destruct;
661
662 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
596 delete $WIDGET{$self+0}; 665 delete $WIDGET{$self+0};
597 #$self->deactivate;
598} 666}
599 667
600############################################################################# 668#############################################################################
601 669
602package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
603 671
604our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
605 673
606use strict; 674use strict;
607use CFClient::OpenGL; 675use CFPlus::OpenGL;
608 676
609sub new { 677sub new {
610 my $class = shift; 678 my $class = shift;
611 679
612 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
643 } 711 }
644} 712}
645 713
646############################################################################# 714#############################################################################
647 715
648package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
649 717
650our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
651 719
652sub new { 720sub new {
653 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
655} 723}
… …
662 730
663sub draw { } 731sub draw { }
664 732
665############################################################################# 733#############################################################################
666 734
667package CFClient::UI::Container; 735package CFPlus::UI::Container;
668 736
669our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
670 738
671sub new { 739sub new {
672 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
673 741
674 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
683 if $children; 751 if $children;
684 752
685 $self 753 $self
686} 754}
687 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
688sub add { 764sub add {
689 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
690 766
691 $_->set_parent ($self) 767 $_->set_parent ($self)
692 for @widgets; 768 for @widgets;
… …
752 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
753} 829}
754 830
755############################################################################# 831#############################################################################
756 832
757package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
758 834
759our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
760 836
761sub new { 837sub new {
762 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
763 839
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 841
766 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
767} 843}
768 844
769sub add { 845sub add {
770 my ($self, $child) = @_; 846 my ($self, $child) = @_;
771 847
772 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
775} 850}
776 851
777sub remove { 852sub remove {
778 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
779 854
780 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
781 856
782 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
783 unless @{$self->{children}}; 858 unless @{$self->{children}};
784} 859}
785 860
786sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
787 862
788sub size_request { 863sub size_request {
789 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
790} 865}
791 866
792sub size_allocate { 867sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
794 869
795 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
796} 873}
797 874
798############################################################################# 875#############################################################################
799 876
800# back-buffered drawing area 877# back-buffered drawing area
801 878
802package CFClient::UI::Window; 879package CFPlus::UI::Window;
803 880
804our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
805 882
806use CFClient::OpenGL; 883use CFPlus::OpenGL;
807 884
808sub new { 885sub new {
809 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
810 887
811 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
816 893
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 895 $self->SUPER::update;
819} 896}
820 897
821sub size_allocate { 898sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
823 900
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
826} 904}
827 905
828sub _render { 906sub _render {
829 my ($self) = @_; 907 my ($self) = @_;
830 908
… …
832} 910}
833 911
834sub render_child { 912sub render_child {
835 my ($self) = @_; 913 my ($self) = @_;
836 914
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
840 918
841 { 919 {
842 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
843 921
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
846 } 926 }
847
848 $self->_render;
849 }; 927 };
850} 928}
851 929
852sub _draw { 930sub _draw {
853 my ($self) = @_; 931 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 932
857 my $tex = $self->{texture} 933 my $tex = $self->{texture}
858 or return; 934 or return;
859 935
860 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
863 939
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
865 941
866 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
867} 943}
868 944
869############################################################################# 945#############################################################################
870 946
871package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
872 948
873our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
874 950
875sub new { 951sub new {
876 my $class = shift; 952 my $class = shift;
877 953
878 $class->SUPER::new ( 954 $class->SUPER::new (
… …
891 $h = 10 if $self->{scroll_y}; 967 $h = 10 if $self->{scroll_y};
892 968
893 ($w, $h) 969 ($w, $h)
894} 970}
895 971
896sub size_allocate { 972sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
898 974
899 my $child = $self->child; 975 my $child = $self->child;
900 976
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 979
904 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
905 $self->update; 981 $self->update;
982
983 1
906} 984}
907 985
908sub set_offset { 986sub set_offset {
909 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
910 988
… …
936 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
938 ) { 1016 ) {
939 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940 } else { 1018 } else {
941 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
942 } 1020 }
943} 1021}
944 1022
945sub _render { 1023sub _render {
946 my ($self) = @_; 1024 my ($self) = @_;
947 1025
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950 1028
951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952 1030
953 $self->SUPER::_render; 1031 $self->SUPER::_render;
954} 1032}
955 1033
956############################################################################# 1034#############################################################################
957 1035
958package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
959 1037
960our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
961 1039
962sub new { 1040sub new {
963 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
964 1042
965 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
966 1044
967 my $self; 1045 my $self;
968 1046
969 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
970 vertical => 1, 1057 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub { 1059 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974 }, 1062 },
975 ; 1063 ;
976 1064
977 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
979 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
980 %arg, 1073 %arg,
981 ); 1074 );
982 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1082 $self->SUPER::add (0, 0, $self->{vp});
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
984 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
985 1087
986 $self 1088 $self
987} 1089}
1090
1091#TODO# update range on size_allocate depending on child
988 1092
989sub add { 1093sub add {
990 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
991 1095
992 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
993} 1097}
994 1098
1099sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_;
1101
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $self->{vslider}->emit (mouse_wheel => $ev);
1105
1106 1
1107}
1108
1109sub update_slider {
1110 my ($self) = @_;
1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1121}
1122
995sub update { 1123sub update {
996 my ($self) = @_; 1124 my ($self) = @_;
997 1125
998 $self->SUPER::update; 1126 $self->SUPER::update;
999 1127 $self->update_slider;
1000 # todo: overwrite size_allocate of child
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1128}
1004 1129
1005sub size_allocate { 1130sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
1007 1132
1133 $self->update_slider;
1008 $self->SUPER::size_allocate ($w, $h); 1134 $self->SUPER::invoke_size_allocate ($w, $h)
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012} 1135}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1136
1017############################################################################# 1137#############################################################################
1018 1138
1019package CFClient::UI::Frame; 1139package CFPlus::UI::Frame;
1020 1140
1021our @ISA = CFClient::UI::Bin::; 1141our @ISA = CFPlus::UI::Bin::;
1022 1142
1023use CFClient::OpenGL; 1143use CFPlus::OpenGL;
1024 1144
1025sub new { 1145sub new {
1026 my $class = shift; 1146 my $class = shift;
1027 1147
1028 $class->SUPER::new ( 1148 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1174 $self->SUPER::_draw;
1055} 1175}
1056 1176
1057############################################################################# 1177#############################################################################
1058 1178
1059package CFClient::UI::FancyFrame; 1179package CFPlus::UI::FancyFrame;
1060 1180
1061our @ISA = CFClient::UI::Bin::; 1181our @ISA = CFPlus::UI::Bin::;
1062 1182
1063use CFClient::OpenGL; 1183use CFPlus::OpenGL;
1064
1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1184
1073sub new { 1185sub new {
1074 my ($class, %arg) = @_; 1186 my ($class, %arg) = @_;
1075 1187
1076 my $title = delete $arg{title}; 1188 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label
1190 align => 1,
1191 valign => 0,
1192 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75;
1194 }
1195
1196 my $self = $class->SUPER::new (
1197 # label => "",
1198 fg => [0.6, 0.3, 0.1],
1199 border => 0.8,
1200 style => 'single',
1201 %arg,
1202 );
1203
1204 $self
1205}
1206
1207sub add {
1208 my ($self, @widgets) = @_;
1209
1210 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1212}
1213
1214sub border {
1215 int $_[0]{border} * $::FONTSIZE
1216}
1217
1218sub size_request {
1219 my ($self) = @_;
1220
1221 ($self->{label_w}, undef) = $self->{label}->size_request
1222 if $self->{label};
1223
1224 my ($w, $h) = $self->SUPER::size_request;
1225
1226 (
1227 $w + $self->border * 2,
1228 $h + $self->border * 2,
1229 )
1230}
1231
1232sub invoke_size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 my $border = $self->border;
1236
1237 $w -= List::Util::max 0, $border * 2;
1238 $h -= List::Util::max 0, $border * 2;
1239
1240 if (my $label = $self->{label}) {
1241 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1242 $label->{h} = List::Util::min $h, $border;
1243 $label->invoke_size_allocate ($label->{w}, $label->{h});
1244 }
1245
1246 $self->child->configure ($border, $border, $w, $h);
1247
1248 1
1249}
1250
1251sub _draw {
1252 my ($self) = @_;
1253
1254 my $child = $self->{children}[0];
1255
1256 my $border = $self->border;
1257 my ($w, $h) = ($self->{w}, $self->{h});
1258
1259 $child->draw;
1260
1261 glColor @{$self->{fg}};
1262 glBegin GL_LINE_STRIP;
1263 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1264 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1265 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1266 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1267 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1268 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1269 glEnd;
1270
1271 if ($self->{label}) {
1272 glTranslate $border * 2, 0;
1273 $self->{label}->_draw;
1274 }
1275}
1276
1277#############################################################################
1278
1279package CFPlus::UI::Toplevel;
1280
1281our @ISA = CFPlus::UI::Bin::;
1282
1283use CFPlus::OpenGL;
1284
1285my $bg =
1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1287 mipmap => 1, wrap => 1;
1288
1289my @border =
1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1292
1293sub new {
1294 my ($class, %arg) = @_;
1077 1295
1078 my $self = $class->SUPER::new ( 1296 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1297 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1298 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1299 border => 0.6,
1082 can_events => 1, 1300 can_events => 1,
1083 min_w => 16, 1301 min_w => 64,
1084 min_h => 16, 1302 min_h => 32,
1085 %arg, 1303 %arg,
1086 ); 1304 );
1087 1305
1088 $self->{title} = new CFClient::UI::Label 1306 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1307 align => 0,
1090 valign => 1, 1308 valign => 1,
1091 text => $title, 1309 text => $self->{title},
1092 fontsize => $self->{border} 1310 fontsize => $self->{border},
1093 if defined $title; 1311 if exists $self->{title};
1312
1313 if ($self->{has_close_button}) {
1314 $self->{close_button} =
1315 new CFPlus::UI::ImageButton
1316 path => 'x1_close.png',
1317 on_activate => sub { $self->emit ("delete") };
1318
1319 $self->CFPlus::UI::Container::add ($self->{close_button});
1320 }
1094 1321
1095 $self 1322 $self
1096} 1323}
1097 1324
1098sub add { 1325sub add {
1099 my ($self, @widgets) = @_; 1326 my ($self, @widgets) = @_;
1100 1327
1101 $self->SUPER::add (@widgets); 1328 $self->SUPER::add (@widgets);
1329 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1330 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1331}
1104 1332
1105sub border { 1333sub border {
1106 int $_[0]{border} * $::FONTSIZE 1334 int $_[0]{border} * $::FONTSIZE
1107} 1335}
1108 1336
1109sub size_request { 1337sub size_request {
1110 my ($self) = @_; 1338 my ($self) = @_;
1111 1339
1112 $self->{title}->size_request 1340 $self->{title_widget}->size_request
1113 if $self->{title}; 1341 if $self->{title_widget};
1342
1343 $self->{close_button}->size_request
1344 if $self->{close_button};
1114 1345
1115 my ($w, $h) = $self->SUPER::size_request; 1346 my ($w, $h) = $self->SUPER::size_request;
1116 1347
1117 ( 1348 (
1118 $w + $self->border * 2, 1349 $w + $self->border * 2,
1119 $h + $self->border * 2, 1350 $h + $self->border * 2,
1120 ) 1351 )
1121} 1352}
1122 1353
1123sub size_allocate { 1354sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1125 1356
1126 if ($self->{title}) { 1357 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1358 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1359 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1360 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1361 }
1131 1362
1132 my $border = $self->border; 1363 my $border = $self->border;
1133 1364
1134 $h -= List::Util::max 0, $border * 2; 1365 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1366 $w -= List::Util::max 0, $border * 2;
1367
1368 $self->child->configure ($border, $border, $w, $h);
1369
1370 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1371 if $self->{close_button};
1372
1373 1
1374}
1375
1376sub invoke_delete {
1377 my ($self) = @_;
1378
1379 $self->hide;
1136 1380
1137 $self->child->configure ($border, $border, $w, $h); 1381 1
1138} 1382}
1139 1383
1140sub button_down { 1384sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1385 my ($self, $ev, $x, $y) = @_;
1142 1386
1143 my ($w, $h) = @$self{qw(w h)}; 1387 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1388 my $border = $self->border;
1145 1389
… …
1176 1420
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1421 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1422
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1423 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1424 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1425 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1426 };
1183 } else { 1427 } else {
1184 return 0; 1428 return 0;
1185 } 1429 }
1186 1430
1187 1 1431 1
1188} 1432}
1189 1433
1190sub button_up { 1434sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1435 my ($self, $ev, $x, $y) = @_;
1192 1436
1193 !!delete $self->{motion} 1437 ! ! delete $self->{motion}
1194} 1438}
1195 1439
1196sub mouse_motion { 1440sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1441 my ($self, $ev, $x, $y) = @_;
1198 1442
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1444
1201 !!$self->{motion} 1445 ! ! $self->{motion}
1446}
1447
1448sub invoke_visibility_change {
1449 my ($self, $visible) = @_;
1450
1451 delete $self->{motion} unless $visible;
1452
1453 0
1202} 1454}
1203 1455
1204sub _draw { 1456sub _draw {
1205 my ($self) = @_; 1457 my ($self) = @_;
1206 1458
… …
1232 1484
1233 glDisable GL_TEXTURE_2D; 1485 glDisable GL_TEXTURE_2D;
1234 1486
1235 $child->draw; 1487 $child->draw;
1236 1488
1237 if ($self->{title}) { 1489 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1490 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1491 $self->{title_widget}->_draw;
1492
1493 glTranslate 0, - ($border - $self->{h});
1240 } 1494 }
1495
1496 $self->{close_button}->draw
1497 if $self->{close_button};
1241} 1498}
1242 1499
1243############################################################################# 1500#############################################################################
1244 1501
1245package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1246 1503
1247our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1248 1505
1249use List::Util qw(max sum); 1506use List::Util qw(max sum);
1250 1507
1251use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1252 1509
1253sub new { 1510sub new {
1254 my $class = shift; 1511 my $class = shift;
1255 1512
1256 $class->SUPER::new ( 1513 $class->SUPER::new (
1257 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1258 @_, 1516 @_,
1259 ) 1517 )
1260} 1518}
1261 1519
1262sub children { 1520sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1522}
1265 1523
1266sub add { 1524sub add {
1267 my ($self, $x, $y, $child) = @_; 1525 my ($self) = shift;
1268 1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1529 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1530 $self->{children}[$y][$x] = $child;
1531 }
1271 1532
1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1535 $self->realloc;
1536}
1537
1538sub remove {
1539 my ($self, $child) = @_;
1540
1541 # TODO: not yet implemented
1273} 1542}
1274 1543
1275# TODO: move to container class maybe? send children a signal on removal? 1544# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1545sub clear {
1277 my ($self) = @_; 1546 my ($self) = @_;
… …
1318 (sum @$ws), 1587 (sum @$ws),
1319 (sum @$hs), 1588 (sum @$hs),
1320 ) 1589 )
1321} 1590}
1322 1591
1323sub size_allocate { 1592sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1325 1594
1326 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1327 1596
1328 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1329 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1330 1599
1331 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1332 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1333 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1334 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1335 1604
1336 # linearly scale sizes
1337 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1338 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1339 1606
1340 CFClient::UI::harmonize $ws; 1607 CFPlus::UI::harmonize $ws;
1608
1609 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1;
1612
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614
1341 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1342 1616
1343 my $y; 1617 my $y;
1344 1618
1345 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1346 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1360 } 1634 }
1361 1635
1362 $y += $row_h; 1636 $y += $row_h;
1363 } 1637 }
1364 1638
1639 1
1365} 1640}
1366 1641
1367sub find_widget { 1642sub find_widget {
1368 my ($self, $x, $y) = @_; 1643 my ($self, $x, $y) = @_;
1369 1644
… …
1388 } 1663 }
1389} 1664}
1390 1665
1391############################################################################# 1666#############################################################################
1392 1667
1393package CFClient::UI::Box; 1668package CFPlus::UI::Box;
1394 1669
1395our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1396 1671
1397sub size_request { 1672sub size_request {
1398 my ($self) = @_; 1673 my ($self) = @_;
1399 1674
1400 $self->{vertical} 1675 $self->{vertical}
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1681 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1682 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1683 )
1409} 1684}
1410 1685
1411sub size_allocate { 1686sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1687 my ($self, $w, $h) = @_;
1413 1688
1414 my $space = $self->{vertical} ? $h : $w; 1689 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1690 my @children = $self->visible_children;
1416 1691
1417 my @req; 1692 my @req;
1418 1693
1419 if ($self->{homogeneous}) { 1694 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1695 @req = ($space / (@children || 1)) x @children;
1421 } else { 1696 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1697 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1698 my $req = List::Util::sum @req;
1424 1699
1425 if ($req > $space) { 1700 if ($req > $space) {
1426 # ah well, not enough space 1701 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1702 $_ *= $space / $req for @req;
1428 } else { 1703 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1704 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1705
1431 $space = ($space - $req) / $expand; # remaining space to give away 1706 $space = ($space - $req) / $expand; # remaining space to give away
1432 1707
1433 $req[$_] += $space * $children->[$_]{expand} 1708 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1709 for 0 .. $#children;
1435 } 1710 }
1436 } 1711 }
1437 1712
1438 CFClient::UI::harmonize \@req; 1713 CFPlus::UI::harmonize \@req;
1439 1714
1440 my $pos = 0; 1715 my $pos = 0;
1441 for (0 .. $#$children) { 1716 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1717 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1718 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1719
1445 $pos += $alloc; 1720 $pos += $alloc;
1446 } 1721 }
1447 1722
1448 1 1723 1
1449} 1724}
1450 1725
1451############################################################################# 1726#############################################################################
1452 1727
1453package CFClient::UI::HBox; 1728package CFPlus::UI::HBox;
1454 1729
1455our @ISA = CFClient::UI::Box::; 1730our @ISA = CFPlus::UI::Box::;
1456 1731
1457sub new { 1732sub new {
1458 my $class = shift; 1733 my $class = shift;
1459 1734
1460 $class->SUPER::new ( 1735 $class->SUPER::new (
… …
1463 ) 1738 )
1464} 1739}
1465 1740
1466############################################################################# 1741#############################################################################
1467 1742
1468package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1469 1744
1470our @ISA = CFClient::UI::Box::; 1745our @ISA = CFPlus::UI::Box::;
1471 1746
1472sub new { 1747sub new {
1473 my $class = shift; 1748 my $class = shift;
1474 1749
1475 $class->SUPER::new ( 1750 $class->SUPER::new (
… …
1478 ) 1753 )
1479} 1754}
1480 1755
1481############################################################################# 1756#############################################################################
1482 1757
1483package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1484 1759
1485our @ISA = CFClient::UI::DrawBG::; 1760our @ISA = CFPlus::UI::DrawBG::;
1486 1761
1487use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1488 1763
1489sub new { 1764sub new {
1490 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1491 1766
1492 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
… …
1495 #active_bg => none 1770 #active_bg => none
1496 #font => default_font 1771 #font => default_font
1497 #text => initial text 1772 #text => initial text
1498 #markup => initial narkup 1773 #markup => initial narkup
1499 #max_w => maximum pixel width 1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1500 ellipsise => 3, # end 1776 ellipsise => 3, # end
1501 layout => (new CFClient::Layout), 1777 layout => (new CFPlus::Layout),
1502 fontsize => 1, 1778 fontsize => 1,
1503 align => -1, 1779 align => -1,
1504 valign => -1, 1780 valign => -1,
1505 padding_x => 2, 1781 padding_x => 2,
1506 padding_y => 2, 1782 padding_y => 2,
1507 can_events => 0, 1783 can_events => 0,
1508 %arg 1784 %arg
1509 ); 1785 );
1510 1786
1511 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1512 my $layout = new CFClient::Layout; 1788 my $layout = new CFPlus::Layout;
1513 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1514 $self->{template} = $layout; 1790 $self->{template} = $layout;
1515 } 1791 }
1516 1792
1517 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1521 } 1797 }
1522 1798
1523 $self 1799 $self
1524} 1800}
1525 1801
1526sub escape($) {
1527 local $_ = $_[0];
1528
1529 s/&/&amp;/g;
1530 s/>/&gt;/g;
1531 s/</&lt;/g;
1532
1533 $_
1534}
1535
1536sub update { 1802sub update {
1537 my ($self) = @_; 1803 my ($self) = @_;
1538 1804
1539 delete $self->{texture}; 1805 delete $self->{texture};
1540 $self->SUPER::update; 1806 $self->SUPER::update;
1541} 1807}
1542 1808
1809sub realloc {
1810 my ($self) = @_;
1811
1812 delete $self->{ox};
1813 $self->SUPER::realloc;
1814}
1815
1543sub set_text { 1816sub set_text {
1544 my ($self, $text) = @_; 1817 my ($self, $text) = @_;
1545 1818
1546 return if $self->{text} eq "T$text"; 1819 return if $self->{text} eq "T$text";
1547 $self->{text} = "T$text"; 1820 $self->{text} = "T$text";
1548 1821
1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1550 $self->{layout}->set_text ($text); 1822 $self->{layout}->set_text ($text);
1551 1823
1824 delete $self->{size_req};
1552 $self->realloc; 1825 $self->realloc;
1553 $self->update; 1826 $self->update;
1554} 1827}
1555 1828
1556sub set_markup { 1829sub set_markup {
… …
1559 return if $self->{text} eq "M$markup"; 1832 return if $self->{text} eq "M$markup";
1560 $self->{text} = "M$markup"; 1833 $self->{text} = "M$markup";
1561 1834
1562 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1835 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1563 1836
1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1565 $self->{layout}->set_markup ($markup); 1837 $self->{layout}->set_markup ($markup);
1566 1838
1839 delete $self->{size_req};
1567 $self->realloc; 1840 $self->realloc;
1568 $self->update; 1841 $self->update;
1569} 1842}
1570 1843
1571sub size_request { 1844sub size_request {
1572 my ($self) = @_; 1845 my ($self) = @_;
1573 1846
1847 $self->{size_req} ||= do {
1574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1848 $self->{layout}->set_font ($self->{font}) if $self->{font};
1575 $self->{layout}->set_width ($self->{max_w} || -1); 1849 $self->{layout}->set_width ($self->{max_w} || -1);
1576 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1850 $self->{layout}->set_ellipsise ($self->{ellipsise});
1577 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1851 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1578 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579 1853
1580 my ($w, $h) = $self->{layout}->size; 1854 my ($w, $h) = $self->{layout}->size;
1581 1855
1582 if (exists $self->{template}) { 1856 if (exists $self->{template}) {
1583 $self->{template}->set_font ($self->{font}) if $self->{font}; 1857 $self->{template}->set_font ($self->{font}) if $self->{font};
1858 $self->{template}->set_width ($self->{max_w} || -1);
1584 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1859 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1585 1860
1586 my ($w2, $h2) = $self->{template}->size; 1861 my ($w2, $h2) = $self->{template}->size;
1587 1862
1588 $w = List::Util::max $w, $w2; 1863 $w = List::Util::max $w, $w2;
1589 $h = List::Util::max $h, $h2; 1864 $h = List::Util::max $h, $h2;
1865 }
1866
1867 [$w, $h]
1590 } 1868 };
1591 1869
1592 ($w, $h) 1870 @{ $self->{size_req} }
1593} 1871}
1594 1872
1873sub baseline_shift {
1874 $_[0]{layout}->descent
1875}
1876
1595sub size_allocate { 1877sub invoke_size_allocate {
1596 my ($self, $w, $h) = @_; 1878 my ($self, $w, $h) = @_;
1597 1879
1598 delete $self->{ox}; 1880 delete $self->{ox};
1599 1881
1600 delete $self->{texture} 1882 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1883 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1884
1885 1
1602} 1886}
1603 1887
1604sub set_fontsize { 1888sub set_fontsize {
1605 my ($self, $fontsize) = @_; 1889 my ($self, $fontsize) = @_;
1606 1890
1607 $self->{fontsize} = $fontsize; 1891 $self->{fontsize} = $fontsize;
1892 delete $self->{size_req};
1608 delete $self->{texture}; 1893 delete $self->{texture};
1609 1894
1610 $self->realloc; 1895 $self->realloc;
1611} 1896}
1612 1897
1898sub reconfigure {
1899 my ($self) = @_;
1900
1901 delete $self->{size_req};
1902 delete $self->{texture};
1903
1904 $self->SUPER::reconfigure;
1905}
1906
1613sub _draw { 1907sub _draw {
1614 my ($self) = @_; 1908 my ($self) = @_;
1615 1909
1616 $self->SUPER::_draw; # draw background, if applicable 1910 $self->SUPER::_draw; # draw background, if applicable
1617 1911
1618 my $tex = $self->{texture} ||= do { 1912 my $size = $self->{texture} ||= do {
1619 $self->{layout}->set_foreground (@{$self->{fg}}); 1913 $self->{layout}->set_foreground (@{$self->{fg}});
1620 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1914 $self->{layout}->set_font ($self->{font}) if $self->{font};
1621 $self->{layout}->set_width ($self->{w}); 1915 $self->{layout}->set_width ($self->{w});
1622 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1916 $self->{layout}->set_ellipsise ($self->{ellipsise});
1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1917 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1918 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1919
1626 new_from_layout CFClient::Texture $self->{layout} 1920 [$self->{layout}->size]
1627 }; 1921 };
1628 1922
1629 unless (exists $self->{ox}) { 1923 unless (exists $self->{ox}) {
1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1924 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1925 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1632 : ($self->{w} - $tex->{w}) * 0.5); 1926 : ($self->{w} - $size->[0]) * 0.5);
1633 1927
1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1928 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1929 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1636 : ($self->{h} - $tex->{h}) * 0.5); 1930 : ($self->{h} - $size->[1]) * 0.5);
1637 }; 1931 };
1638 1932
1639 glEnable GL_TEXTURE_2D; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1641 1935
1642 glColor_premultiply @{$self->{fg}} 1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1643 if $tex->{format} == GL_ALPHA;
1644
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1646
1647 glDisable GL_TEXTURE_2D;
1648} 1937}
1649 1938
1650############################################################################# 1939#############################################################################
1651 1940
1652package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1653 1942
1654our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1655 1944
1656use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1657 1946
1658sub new { 1947sub new {
1659 my $class = shift; 1948 my $class = shift;
1660 1949
1661 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1665 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1666 can_hover => 1, 1955 can_hover => 1,
1667 can_focus => 1, 1956 can_focus => 1,
1668 valign => 0, 1957 valign => 0,
1669 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1670 #text => ... 1960 #text => ...
1961 #hidden => "*",
1671 @_ 1962 @_
1672 ) 1963 )
1673} 1964}
1674 1965
1675sub _set_text { 1966sub _set_text {
… …
1682 $self->{last_activity} = $::NOW; 1973 $self->{last_activity} = $::NOW;
1683 $self->{text} = $text; 1974 $self->{text} = $text;
1684 1975
1685 $text =~ s/./*/g if $self->{hidden}; 1976 $text =~ s/./*/g if $self->{hidden};
1686 $self->{layout}->set_text ("$text "); 1977 $self->{layout}->set_text ("$text ");
1978 delete $self->{size_req};
1687 1979
1688 $self->_emit (changed => $self->{text}); 1980 $self->emit (changed => $self->{text});
1981
1982 $self->realloc;
1689 $self->update; 1983 $self->update;
1690} 1984}
1691 1985
1692sub set_text { 1986sub set_text {
1693 my ($self, $text) = @_; 1987 my ($self, $text) = @_;
1694 1988
1695 $self->{cursor} = length $text; 1989 $self->{cursor} = length $text;
1696 $self->_set_text ($text); 1990 $self->_set_text ($text);
1697
1698 $self->realloc;
1699} 1991}
1700 1992
1701sub get_text { 1993sub get_text {
1702 $_[0]{text} 1994 $_[0]{text}
1703} 1995}
… …
1708 my ($w, $h) = $self->SUPER::size_request; 2000 my ($w, $h) = $self->SUPER::size_request;
1709 2001
1710 ($w + 1, $h) # add 1 for cursor 2002 ($w + 1, $h) # add 1 for cursor
1711} 2003}
1712 2004
1713sub key_down { 2005sub invoke_key_down {
1714 my ($self, $ev) = @_; 2006 my ($self, $ev) = @_;
1715 2007
1716 my $mod = $ev->{mod}; 2008 my $mod = $ev->{mod};
1717 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1718 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1719 2011
1720 my $text = $self->get_text; 2012 my $text = $self->get_text;
2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1721 2015
1722 if ($uni == 8) { 2016 if ($uni == 8) {
1723 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1724 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1725 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1726 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1727 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1728 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1729 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1730 } elsif ($sym == CFClient::SDLK_HOME) { 2024 } elsif ($sym == CFPlus::SDLK_HOME) {
2025 # what a hack
2026 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1
2029 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) {
2031 # uh, again
2032 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1
2035 : length $self->{text};
2036 } elsif ($uni == 21) { # ctrl-u
2037 $text = "";
1731 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1732 } elsif ($sym == CFClient::SDLK_END) {
1733 $self->{cursor} = length $text;
1734 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1735 $self->_emit ('escape'); 2040 $self->emit ('escape');
1736 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1737 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else { 2045 } else {
1739 return 0; 2046 return 0;
1740 } 2047 }
1741 2048
1742 $self->_set_text ($text); 2049 $self->_set_text ($text);
1743 2050
1744 $self->realloc; 2051 $self->realloc;
2052 $self->update;
1745 2053
1746 1 2054 1
1747} 2055}
1748 2056
1749sub focus_in { 2057sub invoke_focus_in {
1750 my ($self) = @_; 2058 my ($self) = @_;
1751 2059
1752 $self->{last_activity} = $::NOW; 2060 $self->{last_activity} = $::NOW;
1753 2061
1754 $self->SUPER::focus_in; 2062 $self->SUPER::invoke_focus_in
1755} 2063}
1756 2064
1757sub button_down { 2065sub invoke_button_down {
1758 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1759 2067
1760 $self->SUPER::button_down ($ev, $x, $y); 2068 $self->SUPER::invoke_button_down ($ev, $x, $y);
1761 2069
1762 my $idx = $self->{layout}->xy_to_index ($x, $y); 2070 my $idx = $self->{layout}->xy_to_index ($x, $y);
1763 2071
1764 # byte-index to char-index 2072 # byte-index to char-index
1765 my $text = $self->{text}; 2073 my $text = $self->{text};
1766 utf8::encode $text; 2074 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1767 $self->{cursor} = length substr $text, 0, $idx; 2075 $self->{cursor} = length $text;
1768 2076
1769 $self->_set_text ($self->{text}); 2077 $self->_set_text ($self->{text});
1770 $self->update; 2078 $self->update;
1771 2079
1772 1 2080 1
1773} 2081}
1774 2082
1775sub mouse_motion { 2083sub invoke_mouse_motion {
1776 my ($self, $ev, $x, $y) = @_; 2084 my ($self, $ev, $x, $y) = @_;
1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2085# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778 2086
1779 0 2087 1
1780} 2088}
1781 2089
1782sub _draw { 2090sub _draw {
1783 my ($self) = @_; 2091 my ($self) = @_;
1784 2092
… …
1811 utf8::encode $text; 2119 utf8::encode $text;
1812 2120
1813 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1814 } 2122 }
1815 2123
1816 glColor @{$self->{fg}};
1817 glBegin GL_LINES; 2124 glBegin GL_LINES;
1818 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2125 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1819 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1820 glEnd; 2127 glEnd;
1821 } 2128 }
1822} 2129}
1823 2130
2131#############################################################################
2132
1824package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1825 2134
1826our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1827 2136
1828use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1829 2138
1830sub key_down { 2139sub invoke_key_down {
1831 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1832 2141
1833 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1834 2143
1835 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1836 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1837 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
2147
1838 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1839 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1840 $self->_emit (activate => $txt); 2150 $self->emit (activate => $txt);
1841 $self->update; 2151 $self->update;
1842 2152
1843 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1844 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1845 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1846 } 2156 }
1847 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1848 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1850 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1851 } 2161 }
1852 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1853 } 2163 }
1854 2164
1855 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1856 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1857 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1858 2168
1859 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1860 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1861 } else { 2171 } else {
1862 $self->set_text ($self->{history_saveback}); 2172 $self->set_text ($self->{history_saveback});
1863 } 2173 }
1864 2174
1865 } else { 2175 } else {
1866 return $self->SUPER::key_down ($ev) 2176 return $self->SUPER::invoke_key_down ($ev)
1867 } 2177 }
1868 2178
1869 1 2179 1
1870} 2180}
1871 2181
1872############################################################################# 2182#############################################################################
1873 2183
2184package CFPlus::UI::TextEdit;
2185
2186our @ISA = CFPlus::UI::EntryBase::;
2187
2188use CFPlus::OpenGL;
2189
2190sub move_cursor_ver {
2191 my ($self, $dy) = @_;
2192
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194
2195 $y += $dy;
2196
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2198 $self->{cursor} = $index;
2199 delete $self->{cur_h};
2200 $self->update;
2201 return;
2202 }
2203}
2204
2205sub invoke_key_down {
2206 my ($self, $ev) = @_;
2207
2208 my $sym = $ev->{sym};
2209
2210 if ($sym == CFPlus::SDLK_UP) {
2211 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1);
2214 } else {
2215 return $self->SUPER::invoke_key_down ($ev)
2216 }
2217
2218 1
2219}
2220
2221#############################################################################
2222
1874package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1875 2224
1876our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1877 2226
1878use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1879 2228
1880my @tex = 2229my @tex =
1881 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1882 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
1883 2232
1884sub new { 2233sub new {
1885 my $class = shift; 2234 my $class = shift;
1886 2235
… …
1895 can_events => 1, 2244 can_events => 1,
1896 @_ 2245 @_
1897 ) 2246 )
1898} 2247}
1899 2248
1900sub activate { }
1901
1902sub button_up { 2249sub invoke_button_up {
1903 my ($self, $ev, $x, $y) = @_; 2250 my ($self, $ev, $x, $y) = @_;
1904 2251
1905 $self->emit ("activate") 2252 $self->emit ("activate")
1906 if $x >= 0 && $x < $self->{w} 2253 if $x >= 0 && $x < $self->{w}
1907 && $y >= 0 && $y < $self->{h}; 2254 && $y >= 0 && $y < $self->{h};
… …
1925 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
1926} 2273}
1927 2274
1928############################################################################# 2275#############################################################################
1929 2276
1930package CFClient::UI::CheckBox; 2277package CFPlus::UI::CheckBox;
1931 2278
1932our @ISA = CFClient::UI::DrawBG::; 2279our @ISA = CFPlus::UI::DrawBG::;
1933 2280
1934my @tex = 2281my @tex =
1935 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1936 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2283 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1937 2284
1938use CFClient::OpenGL; 2285use CFPlus::OpenGL;
1939 2286
1940sub new { 2287sub new {
1941 my $class = shift; 2288 my $class = shift;
1942 2289
1943 $class->SUPER::new ( 2290 $class->SUPER::new (
… …
1957 my ($self) = @_; 2304 my ($self) = @_;
1958 2305
1959 (6) x 2 2306 (6) x 2
1960} 2307}
1961 2308
2309sub toggle {
2310 my ($self) = @_;
2311
2312 $self->{state} = !$self->{state};
2313 $self->emit (changed => $self->{state});
2314 $self->update;
2315}
2316
1962sub button_down { 2317sub invoke_button_down {
1963 my ($self, $ev, $x, $y) = @_; 2318 my ($self, $ev, $x, $y) = @_;
1964 2319
1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2320 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2321 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1967 $self->{state} = !$self->{state}; 2322 $self->toggle;
1968 $self->_emit (changed => $self->{state});
1969 } else { 2323 } else {
1970 return 0 2324 return 0
1971 } 2325 }
1972 2326
1973 1 2327 1
… …
1993 glDisable GL_TEXTURE_2D; 2347 glDisable GL_TEXTURE_2D;
1994} 2348}
1995 2349
1996############################################################################# 2350#############################################################################
1997 2351
1998package CFClient::UI::Image; 2352package CFPlus::UI::Image;
1999 2353
2000our @ISA = CFClient::UI::Base::; 2354our @ISA = CFPlus::UI::Base::;
2001 2355
2002use CFClient::OpenGL; 2356use CFPlus::OpenGL;
2003use Carp qw/confess/;
2004 2357
2005our %loaded_images; 2358our %texture_cache;
2006 2359
2007sub new { 2360sub new {
2008 my $class = shift; 2361 my $class = shift;
2009 2362
2010 my $self = $class->SUPER::new (can_events => 0, @_); 2363 my $self = $class->SUPER::new (
2364 can_events => 0,
2365 @_,
2366 );
2011 2367
2012 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2368 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required";
2013 2370
2014 $loaded_images{$self->{image}} ||= 2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2015 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2016 2373
2017 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2374 CFPlus::weaken $texture_cache{$self->{path}};
2018 2375
2019 Scalar::Util::weaken $loaded_images{$self->{image}}; 2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2020
2021 $self->{aspect} = $tex->{w} / $tex->{h};
2022 2377
2023 $self 2378 $self
2024} 2379}
2025 2380
2381sub STORABLE_freeze {
2382 my ($self, $cloning) = @_;
2383
2384 $self->{path}
2385 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2386
2387 $self->{path}
2388}
2389
2390sub STORABLE_attach {
2391 my ($self, $cloning, $path) = @_;
2392
2393 $self->new (path => $path)
2394}
2395
2026sub size_request { 2396sub size_request {
2027 my ($self) = @_; 2397 my ($self) = @_;
2028 2398
2029 ($self->{tex}->{w}, $self->{tex}->{h}) 2399 ($self->{tex}{w}, $self->{tex}{h})
2030} 2400}
2031 2401
2032sub _draw { 2402sub _draw {
2033 my ($self) = @_; 2403 my ($self) = @_;
2034 2404
… …
2044 } 2414 }
2045 2415
2046 glEnable GL_TEXTURE_2D; 2416 glEnable GL_TEXTURE_2D;
2047 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2048 2418
2049 $tex->draw_quad_alpha (0, 0, $w, $h); 2419 $tex->draw_quad (0, 0, $w, $h);
2050 2420
2051 glDisable GL_TEXTURE_2D; 2421 glDisable GL_TEXTURE_2D;
2052} 2422}
2053 2423
2054############################################################################# 2424#############################################################################
2055 2425
2426package CFPlus::UI::ImageButton;
2427
2428our @ISA = CFPlus::UI::Image::;
2429
2430use CFPlus::OpenGL;
2431
2432my %textures;
2433
2434sub new {
2435 my $class = shift;
2436
2437 my $self = $class->SUPER::new (
2438 padding_x => 4,
2439 padding_y => 4,
2440 fg => [1, 1, 1],
2441 active_fg => [0, 0, 1],
2442 can_hover => 1,
2443 align => 0,
2444 valign => 0,
2445 can_events => 1,
2446 @_
2447 );
2448}
2449
2450sub invoke_button_up {
2451 my ($self, $ev, $x, $y) = @_;
2452
2453 $self->emit ("activate")
2454 if $x >= 0 && $x < $self->{w}
2455 && $y >= 0 && $y < $self->{h};
2456
2457 1
2458}
2459
2460#############################################################################
2461
2056package CFClient::UI::VGauge; 2462package CFPlus::UI::VGauge;
2057 2463
2058our @ISA = CFClient::UI::Base::; 2464our @ISA = CFPlus::UI::Base::;
2059 2465
2060use List::Util qw(min max); 2466use List::Util qw(min max);
2061 2467
2062use CFClient::OpenGL; 2468use CFPlus::OpenGL;
2063 2469
2064my %tex = ( 2470my %tex = (
2065 food => [ 2471 food => [
2066 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2067 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2068 ], 2474 ],
2069 grace => [ 2475 grace => [
2070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2071 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2072 ], 2478 ],
2073 hp => [ 2479 hp => [
2074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2075 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2076 ], 2482 ],
2077 mana => [ 2483 mana => [
2078 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2079 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2080 ], 2486 ],
2081); 2487);
2082 2488
2083# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2143 my $ycut1 = max 0, min 1, $ycut; 2549 my $ycut1 = max 0, min 1, $ycut;
2144 my $ycut2 = max 0, min 1, $ycut - 1; 2550 my $ycut2 = max 0, min 1, $ycut - 1;
2145 2551
2146 my $h1 = $self->{h} * (1 - $ycut1); 2552 my $h1 = $self->{h} * (1 - $ycut1);
2147 my $h2 = $self->{h} * (1 - $ycut2); 2553 my $h2 = $self->{h} * (1 - $ycut2);
2554 my $h3 = $self->{h};
2555
2556 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2148 2557
2149 glEnable GL_BLEND; 2558 glEnable GL_BLEND;
2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2559 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2560 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2152 glEnable GL_TEXTURE_2D; 2561 glEnable GL_TEXTURE_2D;
… …
2171 2580
2172 if ($t3) { 2581 if ($t3) {
2173 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2582 glBindTexture GL_TEXTURE_2D, $t3->{name};
2174 glBegin GL_QUADS; 2583 glBegin GL_QUADS;
2175 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2584 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2176 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2585 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2177 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2586 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2178 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2587 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2179 glEnd; 2588 glEnd;
2180 } 2589 }
2181 2590
2182 glDisable GL_BLEND; 2591 glDisable GL_BLEND;
2183 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2184} 2593}
2185 2594
2186############################################################################# 2595#############################################################################
2187 2596
2188package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
2189 2598
2190our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
2191 2600
2192sub new { 2601sub new {
2193 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
2194 2603
2195 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
2197 can_hover => 1, 2606 can_hover => 1,
2198 can_events => 1, 2607 can_events => 1,
2199 %arg, 2608 %arg,
2200 ); 2609 );
2201 2610
2202 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2611 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2203 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2612 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2204 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2613 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2205 2614
2206 $self 2615 $self
2207} 2616}
2208 2617
2209sub set_fontsize { 2618sub set_fontsize {
… …
2230 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
2231} 2640}
2232 2641
2233############################################################################# 2642#############################################################################
2234 2643
2235package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2236 2645
2237use strict; 2646use strict;
2238 2647
2239use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2240 2649
2241our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2242 2651
2243my @tex = 2652my @tex =
2244 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2245 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2246 2655
2247sub new { 2656sub new {
2248 my $class = shift; 2657 my $class = shift;
2249 2658
… …
2270 $self->update; 2679 $self->update;
2271 2680
2272 $self 2681 $self
2273} 2682}
2274 2683
2275sub changed { }
2276
2277sub set_range { 2684sub set_range {
2278 my ($self, $range) = @_; 2685 my ($self, $range) = @_;
2279 2686
2280 ($range, $self->{range}) = ($self->{range}, $range); 2687 ($range, $self->{range}) = ($self->{range}, $range);
2281 2688
2282 $self->update
2283 if "@$range" ne "@{$self->{range}}"; 2689 if ("@$range" ne "@{$self->{range}}") {
2690 $self->update;
2691 $self->set_value ($self->{range}[0]);
2692 }
2284} 2693}
2285 2694
2286sub set_value { 2695sub set_value {
2287 my ($self, $value) = @_; 2696 my ($self, $value) = @_;
2288 2697
… …
2299 if $unit; 2708 if $unit;
2300 2709
2301 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2710 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2302 2711
2303 if ($value != $old_value) { 2712 if ($value != $old_value) {
2304 $self->_emit (changed => $value); 2713 $self->emit (changed => $value);
2305 $self->update; 2714 $self->update;
2306 } 2715 }
2307} 2716}
2308 2717
2309sub size_request { 2718sub size_request {
2310 my ($self) = @_; 2719 my ($self) = @_;
2311 2720
2312 ($self->{req_w}, $self->{req_h}) 2721 ($self->{req_w}, $self->{req_h})
2313} 2722}
2314 2723
2315sub button_down { 2724sub invoke_button_down {
2316 my ($self, $ev, $x, $y) = @_; 2725 my ($self, $ev, $x, $y) = @_;
2317 2726
2318 $self->SUPER::button_down ($ev, $x, $y); 2727 $self->SUPER::invoke_button_down ($ev, $x, $y);
2319 2728
2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2729 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2321 2730
2322 $self->mouse_motion ($ev, $x, $y) 2731 $self->invoke_mouse_motion ($ev, $x, $y)
2323} 2732}
2324 2733
2325sub mouse_motion { 2734sub invoke_mouse_motion {
2326 my ($self, $ev, $x, $y) = @_; 2735 my ($self, $ev, $x, $y) = @_;
2327 2736
2328 if ($GRAB == $self) { 2737 if ($GRAB == $self) {
2329 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2738 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2330 2739
… …
2336 } else { 2745 } else {
2337 return 0; 2746 return 0;
2338 } 2747 }
2339 2748
2340 1 2749 1
2750}
2751
2752sub invoke_mouse_wheel {
2753 my ($self, $ev) = @_;
2754
2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2760
2761 ! ! $delta
2341} 2762}
2342 2763
2343sub update { 2764sub update {
2344 my ($self) = @_; 2765 my ($self) = @_;
2345 2766
… …
2394 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2395} 2816}
2396 2817
2397############################################################################# 2818#############################################################################
2398 2819
2399package CFClient::UI::ValSlider; 2820package CFPlus::UI::ValSlider;
2400 2821
2401our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2402 2823
2403sub new { 2824sub new {
2404 my ($class, %arg) = @_; 2825 my ($class, %arg) = @_;
2405 2826
2406 my $range = delete $arg{range}; 2827 my $range = delete $arg{range};
2407 2828
2408 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2409 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2410 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2411 to_value => sub { shift }, 2832 to_value => sub { shift },
2412 from_value => sub { shift }, 2833 from_value => sub { shift },
2413 %arg, 2834 %arg,
2414 ); 2835 );
2415 2836
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2856sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2857sub set_value { shift->{slider}->set_value (@_) }
2437 2858
2438############################################################################# 2859#############################################################################
2439 2860
2440package CFClient::UI::TextView; 2861package CFPlus::UI::TextScroller;
2441 2862
2442our @ISA = CFClient::UI::HBox::; 2863our @ISA = CFPlus::UI::HBox::;
2443 2864
2444use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2445 2866
2446sub new { 2867sub new {
2447 my $class = shift; 2868 my $class = shift;
2448 2869
2449 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
2450 fontsize => 1, 2871 fontsize => 1,
2451 can_events => 0, 2872 can_events => 1,
2873 indent => 0,
2452 #font => default_font 2874 #font => default_font
2453 @_, 2875 @_,
2454 2876
2455 layout => (new CFClient::Layout 1), 2877 layout => (new CFPlus::Layout),
2456 par => [], 2878 par => [],
2879 max_par => 0,
2457 height => 0, 2880 height => 0,
2458 children => [ 2881 children => [
2459 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2460 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2461 ], 2884 ],
2462 ); 2885 );
2463 2886
2464 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2465 2888
… …
2471 2894
2472 $self->{fontsize} = $fontsize; 2895 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2896 $self->reflow;
2474} 2897}
2475 2898
2899sub size_request {
2900 my ($self) = @_;
2901
2902 my ($empty, $slider) = @{ $self->{children} };
2903
2904 local $self->{children} = [$empty, $slider];
2905 $self->SUPER::size_request
2906}
2907
2476sub size_allocate { 2908sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2478 2910
2479 $self->SUPER::size_allocate ($w, $h); 2911 my ($empty, $slider, @other) = @{ $self->{children} };
2912 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 2913
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2914 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2915 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 2916 $self->{layout}->set_width ($empty->{w});
2917 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 2918
2485 $self->reflow; 2919 $self->reflow;
2486}
2487 2920
2488sub text_size { 2921 local $self->{children} = [$empty, $slider];
2922 $self->SUPER::invoke_size_allocate ($w, $h)
2923}
2924
2925sub invoke_mouse_wheel {
2489 my ($self, $text, $indent) = @_; 2926 my ($self, $ev) = @_;
2927
2928 return 0 unless $ev->{dy}; # only vertical movements
2929
2930 $self->{children}[1]->emit (mouse_wheel => $ev);
2931
2932 1
2933}
2934
2935sub get_layout {
2936 my ($self, $para) = @_;
2490 2937
2491 my $layout = $self->{layout}; 2938 my $layout = $self->{layout};
2492 2939
2940 $layout->set_font ($self->{font}) if $self->{font};
2941 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2942 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 2943 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2944 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 2945 $layout->set_markup ($para->{markup});
2946
2947 $layout->set_shapes (
2948 map
2949 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2950 @{$para->{widget}}
2496 2951 );
2952
2497 $layout->size 2953 $layout
2498} 2954}
2499 2955
2500sub reflow { 2956sub reflow {
2501 my ($self) = @_; 2957 my ($self) = @_;
2502 2958
… …
2509 2965
2510 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2511 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2512} 2968}
2513 2969
2970sub current_paragraph {
2971 my ($self) = @_;
2972
2973 $self->{top_paragraph} - 1
2974}
2975
2976sub scroll_to {
2977 my ($self, $para) = @_;
2978
2979 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2980
2981 $self->{scroll_to} = $para;
2982 $self->update;
2983}
2984
2514sub clear { 2985sub clear {
2515 my ($self) = @_; 2986 my ($self) = @_;
2987
2988 my (undef, undef, @other) = @{ $self->{children} };
2989 $self->remove ($_) for @other;
2516 2990
2517 $self->{par} = []; 2991 $self->{par} = [];
2518 $self->{height} = 0; 2992 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 2994}
2521 2995
2522sub add_paragraph { 2996sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 2997 my $self = shift;
2524 2998
2525 for my $line (split /\n/, $text) { 2999 for my $para (@_) {
2526 my ($w, $h) = $self->text_size ($line); 3000 $para = {
3001 fg => [1, 1, 1, 1],
3002 indent => 0,
3003 markup => "",
3004 widget => [],
3005 ref $para ? %$para : (markup => $para),
3006 w => 1e10,
3007 wrapped => 1,
3008 };
3009
3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3011 push @{$self->{par}}, $para;
3012 }
3013
3014 if (my $max = $self->{max_par}) {
3015 shift @{$self->{par}} while @{$self->{par}} > $max;
3016 }
3017
3018 $self->{need_reflow}++;
3019 $self->update;
3020}
3021
3022sub scroll_to_bottom {
3023 my ($self) = @_;
3024
3025 $self->{scroll_to} = $#{$self->{par}};
3026 $self->update;
3027}
3028
3029sub force_uptodate {
3030 my ($self) = @_;
3031
3032 if (delete $self->{need_reflow}) {
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034
3035 my $height = 0;
3036
3037 for my $para (@{$self->{par}}) {
3038 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3039 my $layout = $self->get_layout ($para);
3040 my ($w, $h) = $layout->size;
3041
3042 $para->{w} = $w + $para->{indent};
3043 $para->{h} = $h;
3044 $para->{wrapped} = $layout->has_wrapped;
3045 }
3046
3047 $para->{y} = $height;
3048 $height += $para->{h};
3049 }
3050
2527 $self->{height} += $h; 3051 $self->{height} = $height;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2529 }
2530 3053
2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3054 delete $self->{texture};
3055 }
3056
3057 if (my $paridx = delete $self->{scroll_to}) {
3058 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3059 }
2532} 3060}
2533 3061
2534sub update { 3062sub update {
2535 my ($self) = @_; 3063 my ($self) = @_;
2536 3064
… …
2538 3066
2539 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2540 3068
2541 delete $self->{texture}; 3069 delete $self->{texture};
2542 3070
2543 $ROOT->on_post_alloc ($self, sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 3075
2546 if (delete $self->{need_reflow}) {
2547 my $height = 0;
2548
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h;
2560 }
2561
2562 $height += $_->[1];
2563 }
2564
2565 $self->{height} = $height;
2566
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2568
2569 delete $self->{texture};
2570 }
2571
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2573 glClearColor 0, 0, 0, 0; 3077 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2575 3079
3080 package CFPlus::UI::Base;
3081 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h});
3083
3084 my $top = int $self->{children}[1]{range}[0];
3085
3086 my $paridx = 0;
3087 my $top_paragraph;
2576 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2577 3089
2578 my $y0 = $top; 3090 my $y0 = $top;
2579 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2580 3092
2581 my $y = 0;
2582
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2591 for my $par (@{$self->{par}}) { 3093 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2593 3096
2594 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] }); 3098 my $layout = $self->get_layout ($para);
2596 $layout->set_width ($W - $par->[3]);
2597 $layout->set_markup ($par->[4]);
2598 3099
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3100 $layout->render ($para->{indent}, $y - $y0);
2600 3101
2601 glRasterPos $par->[3], $y - $y0; 3102 if (my @w = @{ $para->{widget} }) {
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3103 my @s = $layout->get_shapes;
3104
3105 for (@w) {
3106 my ($dx, $dy) = splice @s, 0, 2, ();
3107
3108 $_->{x} = $dx + $para->{indent};
3109 $_->{y} = $dy + $y - $y0;
3110
3111 $_->draw;
3112 }
3113 }
2603 } 3114 }
2604 3115
2605 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2606 } 3118 }
2607 3119
2608 glDisable GL_BLEND; 3120 $self->{top_paragraph} = $top_paragraph;
2609 }; 3121 };
2610 }); 3122 });
3123}
3124
3125sub reconfigure {
3126 my ($self) = @_;
3127
3128 $self->SUPER::reconfigure;
3129
3130 $_->{w} = 1e10 for @{ $self->{par} };
3131 $self->reflow;
2611} 3132}
2612 3133
2613sub _draw { 3134sub _draw {
2614 my ($self) = @_; 3135 my ($self) = @_;
2615 3136
… …
2618 glColor 0, 0, 0, 1; 3139 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3140 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 3141 glDisable GL_TEXTURE_2D;
2621 3142
2622 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2623
2624} 3144}
2625 3145
2626############################################################################# 3146#############################################################################
2627 3147
2628package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2629 3149
2630use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2631 3151
2632our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2633 3153
2634sub moveto { 3154sub moveto {
2635 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2636 3156
2637 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2665 glPopMatrix; 3185 glPopMatrix;
2666} 3186}
2667 3187
2668############################################################################# 3188#############################################################################
2669 3189
2670package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2671 3191
2672our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2673 3193
2674sub new { 3194sub new {
2675 my $class = shift; 3195 my $class = shift;
2676 3196
2677 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
… …
2689 $self->{other}->toggle_visibility; 3209 $self->{other}->toggle_visibility;
2690} 3210}
2691 3211
2692############################################################################# 3212#############################################################################
2693 3213
2694package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2695 3215
2696our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2697 3217
2698use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2699 3219
2700sub new { 3220sub new {
2701 my $class = shift; 3221 my $class = shift;
2702 3222
2703 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2706 ) 3226 )
2707} 3227}
2708 3228
2709sub set_tooltip_from { 3229sub set_tooltip_from {
2710 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
2711 3234
2712 my $tooltip = $widget->{tooltip}; 3235 my $tooltip = $widget->{tooltip};
2713 3236
2714 if ($ENV{CFPLUS_DEBUG} & 2) { 3237 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3239 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 3240 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 3241 . "visible $widget->{visible}";
2719 } 3242 }
2720 3243
3244 $tooltip =~ s/^\n+//;
3245 $tooltip =~ s/\n+$//;
3246
2721 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2722 markup => $tooltip, 3248 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 3250 fontsize => 0.8,
2725 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
2726 ellipsise => 0, 3252 ellipsise => 0,
2727 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2728 ); 3254 );
2729} 3255}
2730 3256
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3260 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 3261
2736 ($w + 4, $h + 4) 3262 ($w + 4, $h + 4)
2737} 3263}
2738 3264
2739sub size_allocate { 3265sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 3266 my ($self, $w, $h) = @_;
2741 3267
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 3268 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 3269}
2744 3270
2745sub visibility_change { 3271sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 3272 my ($self, $visible) = @_;
2747 3273
2748 return unless $visible; 3274 return unless $visible;
2749 3275
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 3276 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner} 3277 my $widget = $self->{owner}
2752 or return; 3278 or return;
2753 3279
3280 if ($widget->{visible}) {
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 3282
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 3284 if $x + $self->{w} > $self->{root}{w};
2758 3285
2759 $self->move_abs ($x, $y); 3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
2760 }); 3290 });
2761} 3291}
2762 3292
2763sub _draw { 3293sub _draw {
2764 my ($self) = @_; 3294 my ($self) = @_;
… …
2788 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
2789} 3319}
2790 3320
2791############################################################################# 3321#############################################################################
2792 3322
2793package CFClient::UI::Face; 3323package CFPlus::UI::Face;
2794 3324
2795our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
2796 3326
2797use CFClient::OpenGL; 3327use CFPlus::OpenGL;
2798 3328
2799sub new { 3329sub new {
2800 my $class = shift; 3330 my $class = shift;
2801 3331
2802 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
3333 size_w => 32,
3334 size_h => 8,
2803 aspect => 1, 3335 aspect => 1,
2804 can_events => 0, 3336 can_events => 0,
2805 @_, 3337 @_,
2806 ); 3338 );
2807 3339
2808 if ($self->{anim} && $self->{animspeed}) { 3340 if ($self->{anim} && $self->{animspeed}) {
2809 Scalar::Util::weaken (my $widget = $self); 3341 CFPlus::weaken (my $widget = $self);
2810 3342
2811 $self->{timer} = Event->timer ( 3343 $self->{timer} = Event->timer (
2812 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3344 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2813 hard => 1, 3345 hard => 1,
2814 interval => $self->{animspeed}, 3346 interval => $self->{animspeed},
2815 cb => sub { 3347 cb => sub {
3348 return unless $::CONN;
3349
2816 ++$widget->{frame}; 3350 ++$widget->{frame};
3351 $self->update_face;
2817 $widget->update; 3352 $self->update;
2818 }, 3353 },
2819 ); 3354 );
3355
3356 $self->update_face;
2820 } 3357 }
2821 3358
2822 $self 3359 $self
2823} 3360}
2824 3361
3362sub update_face {
3363 my ($self) = @_;
3364
3365 return unless $::CONN;
3366
3367 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3368 if ($anim && @$anim) {
3369 delete $self->{wait_face};
3370 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3371 }
3372 }
3373}
3374
2825sub size_request { 3375sub size_request {
2826 (32, 8) 3376 my ($self) = @_;
3377
3378 if ($::CONN) {
3379 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3380 if (my $tex = $::CONN->{texture}[$faceid]) {
3381 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3382 } else {
3383 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3384 $self->realloc;
3385 });
3386 }
3387 }
3388 }
3389
3390 ($self->{size_w} || 8, $self->{size_h} || 8)
2827} 3391}
2828 3392
2829sub update { 3393sub update {
2830 my ($self) = @_; 3394 my ($self) = @_;
2831 3395
… …
2837sub _draw { 3401sub _draw {
2838 my ($self) = @_; 3402 my ($self) = @_;
2839 3403
2840 return unless $::CONN; 3404 return unless $::CONN;
2841 3405
2842 my $face; 3406 $self->SUPER::_draw;
2843 3407
2844 if ($self->{frame}) {
2845 my $anim = $::CONN->{anim}[$self->{anim}]; 3408 my $faceid = $::CONN->{faceid}[$self->{face}]
2846 3409 or return;
2847 $face = $anim->[ $self->{frame} % @$anim ]
2848 if $anim && @$anim;
2849 }
2850 3410
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3411 my $tex = $::CONN->{texture}[$faceid];
2852 3412
2853 if ($tex) { 3413 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 3414 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 0, 0, 0, 1; 3416 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3418 glDisable GL_TEXTURE_2D;
2859 } 3419 }
2860} 3420}
2861 3421
2862sub DESTROY { 3422sub destroy {
2863 my ($self) = @_; 3423 my ($self) = @_;
2864 3424
2865 $self->{timer}->cancel 3425 $self->{timer}->cancel
2866 if $self->{timer}; 3426 if $self->{timer};
2867 3427
2868 $self->SUPER::DESTROY; 3428 $self->SUPER::destroy;
2869} 3429}
2870 3430
2871############################################################################# 3431#############################################################################
2872 3432
2873package CFClient::UI::Buttonbar; 3433package CFPlus::UI::Buttonbar;
2874 3434
2875our @ISA = CFClient::UI::HBox::; 3435our @ISA = CFPlus::UI::HBox::;
2876 3436
2877# TODO: should actualyl wrap buttons and other goodies. 3437# TODO: should actually wrap buttons and other goodies.
2878 3438
2879############################################################################# 3439#############################################################################
2880 3440
2881package CFClient::UI::Menu; 3441package CFPlus::UI::Menu;
2882 3442
2883our @ISA = CFClient::UI::FancyFrame::; 3443our @ISA = CFPlus::UI::Toplevel::;
2884 3444
2885use CFClient::OpenGL; 3445use CFPlus::OpenGL;
2886 3446
2887sub new { 3447sub new {
2888 my $class = shift; 3448 my $class = shift;
2889 3449
2890 my $self = $class->SUPER::new ( 3450 my $self = $class->SUPER::new (
2891 items => [], 3451 items => [],
2892 z => 100, 3452 z => 100,
2893 @_, 3453 @_,
2894 ); 3454 );
2895 3455
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3456 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2897 3457
2898 for my $item (@{ $self->{items} }) { 3458 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3459 my ($widget, $cb, $tooltip) = @$item;
2900 3460
2901 # handle various types of items, only text for now 3461 # handle various types of items, only text for now
2902 if (!ref $widget) { 3462 if (!ref $widget) {
3463 if ($widget =~ /\t/) {
3464 my ($left, $right) = split /\t/, $widget, 2;
3465
2903 $widget = new CFClient::UI::Label 3466 $widget = new CFPlus::UI::HBox
2904 can_hover => 1, 3467 can_hover => 1,
2905 can_events => 1, 3468 can_events => 1,
3469 tooltip => $tooltip,
3470 children => [
3471 (new CFPlus::UI::Label markup => $left, expand => 1),
3472 (new CFPlus::UI::Label markup => $right, align => +1),
3473 ],
3474 ;
3475
3476 } else {
3477 $widget = new CFPlus::UI::Label
3478 can_hover => 1,
3479 can_events => 1,
2906 text => $widget; 3480 markup => $widget,
3481 tooltip => $tooltip;
3482 }
2907 } 3483 }
2908 3484
2909 $self->{item}{$widget} = $item; 3485 $self->{item}{$widget} = $item;
2910 3486
2911 $self->{vbox}->add ($widget); 3487 $self->{vbox}->add ($widget);
… …
2916 3492
2917# popup given the event (must be a mouse button down event currently) 3493# popup given the event (must be a mouse button down event currently)
2918sub popup { 3494sub popup {
2919 my ($self, $ev) = @_; 3495 my ($self, $ev) = @_;
2920 3496
2921 $self->_emit ("popdown"); 3497 $self->emit ("popdown");
2922 3498
2923 # maybe save $GRAB? must be careful about events... 3499 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3500 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3501 $self->{button} = $ev->{button};
2926 3502
2927 $self->show; 3503 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3504 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3505}
2930 3506
2931sub mouse_motion { 3507sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3508 my ($self, $ev, $x, $y) = @_;
2933 3509
2934 # TODO: should use vbox->find_widget or so 3510 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3511 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3512 $self->{hover} = $self->{item}{$HOVER};
2937 3513
2938 0 3514 0
2939} 3515}
2940 3516
2941sub button_up { 3517sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3518 my ($self, $ev, $x, $y) = @_;
2943 3519
2944 if ($ev->{button} == $self->{button}) { 3520 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3521 undef $GRAB;
2946 $self->hide; 3522 $self->hide;
2947 3523
2948 $self->_emit ("popdown"); 3524 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3525 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3526 } else {
2951 return 0 3527 return 0
2952 } 3528 }
2953 3529
2954 1 3530 1
2955} 3531}
2956 3532
2957############################################################################# 3533#############################################################################
2958 3534
2959package CFClient::UI::Multiplexer; 3535package CFPlus::UI::Multiplexer;
2960 3536
2961our @ISA = CFClient::UI::Container::; 3537our @ISA = CFPlus::UI::Container::;
2962 3538
2963sub new { 3539sub new {
2964 my $class = shift; 3540 my $class = shift;
2965 3541
2966 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
… …
2980 3556
2981 $self->{current} = $self->{children}[0] 3557 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} }; 3558 if @{ $self->{children} };
2983} 3559}
2984 3560
3561sub get_current_page {
3562 my ($self) = @_;
3563
3564 $self->{current}
3565}
3566
2985sub set_current_page { 3567sub set_current_page {
2986 my ($self, $page_or_widget) = @_; 3568 my ($self, $page_or_widget) = @_;
2987 3569
2988 my $widget = ref $page_or_widget 3570 my $widget = ref $page_or_widget
2989 ? $page_or_widget 3571 ? $page_or_widget
2990 : $self->{children}[$page_or_widget]; 3572 : $self->{children}[$page_or_widget];
2991 3573
2992 $self->{current} = $widget; 3574 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3575 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3576
2995 $self->_emit (page_changed => $self->{current}); 3577 $self->emit (page_changed => $self->{current});
2996 3578
2997 $self->realloc; 3579 $self->realloc;
2998} 3580}
2999 3581
3000sub visible_children { 3582sub visible_children {
… …
3005 my ($self) = @_; 3587 my ($self) = @_;
3006 3588
3007 $self->{current}->size_request 3589 $self->{current}->size_request
3008} 3590}
3009 3591
3010sub size_allocate { 3592sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3593 my ($self, $w, $h) = @_;
3012 3594
3013 $self->{current}->configure (0, 0, $w, $h); 3595 $self->{current}->configure (0, 0, $w, $h);
3596
3597 1
3014} 3598}
3015 3599
3016sub _draw { 3600sub _draw {
3017 my ($self) = @_; 3601 my ($self) = @_;
3018 3602
3019 $self->{current}->draw; 3603 $self->{current}->draw;
3020} 3604}
3021 3605
3022############################################################################# 3606#############################################################################
3023 3607
3024package CFClient::UI::Notebook; 3608package CFPlus::UI::Notebook;
3025 3609
3026our @ISA = CFClient::UI::VBox::; 3610our @ISA = CFPlus::UI::VBox::;
3027 3611
3028sub new { 3612sub new {
3029 my $class = shift; 3613 my $class = shift;
3030 3614
3031 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar), 3616 buttonbar => (new CFPlus::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3617 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self 3618 # filter => # will be put between multiplexer and $self
3035 @_, 3619 @_,
3036 ); 3620 );
3037 3621
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3622 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3042} 3626}
3043 3627
3044sub add { 3628sub add {
3045 my ($self, $title, $widget, $tooltip) = @_; 3629 my ($self, $title, $widget, $tooltip) = @_;
3046 3630
3047 Scalar::Util::weaken $self; 3631 CFPlus::weaken $self;
3048 3632
3049 $self->{buttonbar}->add (new CFClient::UI::Button 3633 $self->{buttonbar}->add (new CFPlus::UI::Button
3050 markup => $title, 3634 markup => $title,
3051 tooltip => $tooltip, 3635 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) }, 3636 on_activate => sub { $self->set_current_page ($widget) },
3053 ); 3637 );
3054 3638
3055 $self->{multiplexer}->add ($widget); 3639 $self->{multiplexer}->add ($widget);
3056} 3640}
3057 3641
3642sub get_current_page {
3643 my ($self) = @_;
3644
3645 $self->{multiplexer}->get_current_page
3646}
3647
3058sub set_current_page { 3648sub set_current_page {
3059 my ($self, $page) = @_; 3649 my ($self, $page) = @_;
3060 3650
3061 $self->{multiplexer}->set_current_page ($page); 3651 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3652 $self->emit (page_changed => $self->{multiplexer}{current});
3063} 3653}
3064 3654
3065############################################################################# 3655#############################################################################
3066 3656
3657package CFPlus::UI::Selector;
3658
3659use utf8;
3660
3661our @ISA = CFPlus::UI::Button::;
3662
3663sub new {
3664 my $class = shift;
3665
3666 my $self = $class->SUPER::new (
3667 options => [], # [value, title, longdesc], ...
3668 value => undef,
3669 @_,
3670 );
3671
3672 $self->_set_value ($self->{value});
3673
3674 $self
3675}
3676
3677sub invoke_button_down {
3678 my ($self, $ev) = @_;
3679
3680 my @menu_items;
3681
3682 for (@{ $self->{options} }) {
3683 my ($value, $title, $tooltip) = @$_;
3684
3685 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3686 }
3687
3688 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3689}
3690
3691sub _set_value {
3692 my ($self, $value) = @_;
3693
3694 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3695 or return;
3696
3697 $self->{value} = $item->[0];
3698 $self->set_markup ("$item->[1] ⇓");
3699 $self->set_tooltip ($item->[2]);
3700}
3701
3702sub set_value {
3703 my ($self, $value) = @_;
3704
3705 return unless $self->{value} ne $value;
3706
3707 $self->_set_value ($value);
3708 $self->emit (changed => $value);
3709}
3710
3711#############################################################################
3712
3067package CFClient::UI::Statusbox; 3713package CFPlus::UI::Statusbox;
3068 3714
3069our @ISA = CFClient::UI::VBox::; 3715our @ISA = CFPlus::UI::VBox::;
3070 3716
3071sub new { 3717sub new {
3072 my $class = shift; 3718 my $class = shift;
3073 3719
3074 my $self = $class->SUPER::new ( 3720 my $self = $class->SUPER::new (
3075 fontsize => 0.8, 3721 fontsize => 0.8,
3076 @_, 3722 @_,
3077 ); 3723 );
3078 3724
3079 Scalar::Util::weaken (my $this = $self); 3725 CFPlus::weaken (my $this = $self);
3080 3726
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { 3727 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082 $this->reorder;
3083 $this->update;
3084 });
3085 3728
3086 $self 3729 $self
3087} 3730}
3088 3731
3089sub reorder { 3732sub reorder {
3090 my ($self) = @_; 3733 my ($self) = @_;
3091 my $NOW = Time::HiRes::time; 3734 my $NOW = Time::HiRes::time;
3735
3736 # freeze display when hovering over any label
3737 return if $CFPlus::UI::TOOLTIP->{owner}
3738 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3739 values %{ $self->{item} };
3092 3740
3093 while (my ($k, $v) = each %{ $self->{item} }) { 3741 while (my ($k, $v) = each %{ $self->{item} }) {
3094 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3742 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3095 } 3743 }
3096 3744
… …
3105 3753
3106 my $count = 10 + 1; 3754 my $count = 10 + 1;
3107 for my $item (@items) { 3755 for my $item (@items) {
3108 last unless --$count; 3756 last unless --$count;
3109 3757
3110 push @widgets, $item->{label} ||= do { 3758 my $label = $item->{label} ||= do {
3111 # TODO: doesn't handle markup well (read as: at all) 3759 # TODO: doesn't handle markup well (read as: at all)
3112 my $short = $item->{count} > 1 3760 my $short = $item->{count} > 1
3113 ? "<b>$item->{count} ×</b> $item->{text}" 3761 ? "<b>$item->{count} ×</b> $item->{text}"
3114 : $item->{text}; 3762 : $item->{text};
3115 3763
3116 for ($short) { 3764 for ($short) {
3117 s/^\s+//; 3765 s/^\s+//;
3118 s/\s+/ /g; 3766 s/\s+/ /g;
3119 } 3767 }
3120 3768
3121 new CFClient::UI::Label 3769 new CFPlus::UI::Label
3122 markup => $short, 3770 markup => $short,
3123 tooltip => $item->{tooltip}, 3771 tooltip => $item->{tooltip},
3124 tooltip_font => $::FONT_PROP, 3772 tooltip_font => $::FONT_PROP,
3125 tooltip_width => 0.67, 3773 tooltip_width => 0.67,
3126 fontsize => $item->{fontsize} || $self->{fontsize}, 3774 fontsize => $item->{fontsize} || $self->{fontsize},
3127 max_w => $::WIDTH * 0.44, 3775 max_w => $::WIDTH * 0.44,
3128 fg => $item->{fg}, 3776 fg => [@{ $item->{fg} }],
3129 orig_alpha => $item->{fg}[3] || 1,
3130 can_events => 1, 3777 can_events => 1,
3131 can_hover => 1 3778 can_hover => 1
3132 }; 3779 };
3133 3780
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) { 3781 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2; 3782 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update; 3783 $label->update;
3784 $label->set_max_size (undef, $label->{req_h} * $diff)
3785 if $diff < 1;
3141 $self->{timer}->interval (1/30); 3786 $self->{timer}->interval (1/30);
3787 } else {
3788 $label->{fg}[3] = $item->{fg}[3] || 1;
3142 } 3789 }
3790
3791 push @widgets, $label;
3143 } 3792 }
3144 3793
3145 $self->clear; 3794 $self->clear;
3146 $self->SUPER::add (reverse @widgets); 3795 $self->SUPER::add (reverse @widgets);
3147} 3796}
… …
3163 $item->{count}++; 3812 $item->{count}++;
3164 } else { 3813 } else {
3165 $item->{count} = 1; 3814 $item->{count} = 1;
3166 $item->{text} = $item->{tooltip} = $text; 3815 $item->{text} = $item->{tooltip} = $text;
3167 } 3816 }
3168 $item->{id} = ++$self->{id}; 3817 $item->{id} += 0.2;#d#
3169 $item->{timeout} = $timeout; 3818 $item->{timeout} = $timeout;
3170 delete $item->{label}; 3819 delete $item->{label};
3171 } else { 3820 } else {
3172 $self->{item}{$group} = { 3821 $self->{item}{$group} = {
3173 id => ++$self->{id}, 3822 id => ++$self->{id},
… …
3179 count => 1, 3828 count => 1,
3180 %arg, 3829 %arg,
3181 }; 3830 };
3182 } 3831 }
3183 3832
3833 $ROOT->on_refresh (reorder => sub {
3184 $self->reorder; 3834 $self->reorder;
3835 });
3185} 3836}
3186 3837
3187sub reconfigure { 3838sub reconfigure {
3188 my ($self) = @_; 3839 my ($self) = @_;
3189 3840
… …
3192 3843
3193 $self->reorder; 3844 $self->reorder;
3194 $self->SUPER::reconfigure; 3845 $self->SUPER::reconfigure;
3195} 3846}
3196 3847
3197sub DESTROY { 3848sub destroy {
3198 my ($self) = @_; 3849 my ($self) = @_;
3199 3850
3200 $self->{timer}->cancel; 3851 $self->{timer}->cancel;
3201 3852
3202 $self->SUPER::DESTROY; 3853 $self->SUPER::destroy;
3203} 3854}
3204 3855
3205############################################################################# 3856#############################################################################
3206 3857
3207package CFClient::UI::Inventory;
3208
3209our @ISA = CFClient::UI::ScrolledWindow::;
3210
3211sub new {
3212 my $class = shift;
3213
3214 my $self = $class->SUPER::new (
3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3216 @_,
3217 );
3218
3219 $self
3220}
3221
3222sub set_items {
3223 my ($self, $items) = @_;
3224
3225 $self->{child}->clear;
3226 return unless $items;
3227
3228 my @items = sort {
3229 ($a->{type} <=> $b->{type})
3230 or ($a->{name} cmp $b->{name})
3231 } @$items;
3232
3233 $self->{real_items} = \@items;
3234
3235 my $row = 0;
3236 for my $item (@items) {
3237 CFClient::Item::update_widgets $item;
3238
3239 $self->{child}->add (0, $row, $item->{face_widget});
3240 $self->{child}->add (1, $row, $item->{desc_widget});
3241 $self->{child}->add (2, $row, $item->{weight_widget});
3242
3243 $row++;
3244 }
3245}
3246
3247#############################################################################
3248
3249package CFClient::UI::BindEditor;
3250
3251our @ISA = CFClient::UI::FancyFrame::;
3252
3253sub new {
3254 my $class = shift;
3255
3256 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3257
3258 $self->add (my $vb = new CFClient::UI::VBox);
3259
3260
3261 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3262 text => "start recording",
3263 tooltip => "Start/Stops recording of actions."
3264 ."All subsequent actions after the recording started will be captured."
3265 ."The actions are displayed after the record was stopped."
3266 ."To bind the action you have to click on the 'Bind' button",
3267 on_activate => sub {
3268 unless ($self->{recording}) {
3269 $self->start;
3270 } else {
3271 $self->stop;
3272 }
3273 });
3274
3275 $vb->add (new CFClient::UI::Label text => "Actions:");
3276 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3277
3278 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3279 $vb->add (my $hb = new CFClient::UI::HBox);
3280 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3281 $hb->add (new CFClient::UI::Button
3282 text => "bind",
3283 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3284 on_activate => sub {
3285 $self->ask_for_bind;
3286 });
3287
3288 $vb->add (my $hb = new CFClient::UI::HBox);
3289 $hb->add (new CFClient::UI::Button
3290 text => "ok",
3291 expand => 1,
3292 tooltip => "This closes the binding editor and saves the binding",
3293 on_activate => sub {
3294 $self->hide;
3295 $self->commit;
3296 });
3297
3298 $hb->add (new CFClient::UI::Button
3299 text => "cancel",
3300 expand => 1,
3301 tooltip => "This closes the binding editor without saving",
3302 on_activate => sub {
3303 $self->hide;
3304 $self->{binding_cancel}->()
3305 if $self->{binding_cancel};
3306 });
3307
3308 $self->update_binding_widgets;
3309
3310 $self
3311}
3312
3313sub commit {
3314 my ($self) = @_;
3315 my ($mod, $sym, $cmds) = $self->get_binding;
3316 if ($sym != 0 && @$cmds > 0) {
3317 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3318 ."'. Don't forget 'Save Config'!");
3319 $self->{binding_change}->($mod, $sym, $cmds)
3320 if $self->{binding_change};
3321 } else {
3322 $::STATUSBOX->add ("No action bound, no key or action specified!");
3323 $self->{binding_cancel}->()
3324 if $self->{binding_cancel};
3325 }
3326}
3327
3328sub start {
3329 my ($self) = @_;
3330
3331 $self->{rec_btn}->set_text ("stop recording");
3332 $self->{recording} = 1;
3333 $self->clear_command_list;
3334 $::CONN->start_record if $::CONN;
3335}
3336
3337sub stop {
3338 my ($self) = @_;
3339
3340 $self->{rec_btn}->set_text ("start recording");
3341 $self->{recording} = 0;
3342
3343 my $rec;
3344 $rec = $::CONN->stop_record if $::CONN;
3345 return unless ref $rec eq 'ARRAY';
3346 $self->set_command_list ($rec);
3347}
3348
3349
3350sub ask_for_bind_and_commit {
3351 my ($self) = @_;
3352 $self->ask_for_bind (1);
3353}
3354
3355sub ask_for_bind {
3356 my ($self, $commit) = @_;
3357
3358 CFClient::Binder::open_binding_dialog (sub {
3359 my ($mod, $sym) = @_;
3360 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361 $self->update_binding_widgets;
3362 $self->commit if $commit;
3363 });
3364}
3365
3366# $mod and $sym are the modifiers and key symbol
3367# $cmds is a array ref of strings (the commands)
3368# $cb is the callback that is executed on OK
3369# $ccb is the callback that is executed on CANCEL and
3370# when the binding was unsuccessful on OK
3371sub set_binding {
3372 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3373
3374 $self->clear_command_list;
3375 $self->{recording} = 0;
3376 $self->{rec_btn}->set_text ("start recording");
3377
3378 $self->{binding} = [$mod, $sym];
3379 $self->{commands} = $cmds;
3380
3381 $self->{binding_change} = $cb;
3382 $self->{binding_cancel} = $ccb;
3383
3384 $self->update_binding_widgets;
3385}
3386
3387# this is a shortcut method that asks for a binding
3388# and then just binds it.
3389sub do_quick_binding {
3390 my ($self, $cmds) = @_;
3391 $self->set_binding (undef, undef, $cmds, sub {
3392 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393 });
3394 $self->ask_for_bind (1);
3395}
3396
3397sub update_binding_widgets {
3398 my ($self) = @_;
3399 my ($mod, $sym, $cmds) = $self->get_binding;
3400 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3401 $self->set_command_list ($cmds);
3402}
3403
3404sub get_binding {
3405 my ($self) = @_;
3406 return (
3407 $self->{binding}->[0],
3408 $self->{binding}->[1],
3409 [ grep { defined $_ } @{$self->{commands}} ]
3410 );
3411}
3412
3413sub clear_command_list {
3414 my ($self) = @_;
3415 $self->{cmdbox}->clear ();
3416}
3417
3418sub set_command_list {
3419 my ($self, $cmds) = @_;
3420
3421 $self->{cmdbox}->clear ();
3422 $self->{commands} = $cmds;
3423
3424 my $idx = 0;
3425
3426 for (@$cmds) {
3427 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3428
3429 my $i = $idx;
3430 $hb->add (new CFClient::UI::Label text => $_);
3431 $hb->add (new CFClient::UI::Button
3432 text => "delete",
3433 tooltip => "Deletes the action from the record",
3434 on_activate => sub {
3435 $self->{cmdbox}->remove ($hb);
3436 $cmds->[$i] = undef;
3437 });
3438
3439
3440 $idx++
3441 }
3442}
3443
3444#############################################################################
3445
3446package CFClient::UI::SpellList;
3447
3448our @ISA = CFClient::UI::Table::;
3449
3450sub new {
3451 my $class = shift;
3452
3453 my $self = $class->SUPER::new (
3454 binding => [],
3455 commands => [],
3456 @_,
3457 )
3458}
3459
3460# XXX: Do sorting? Argl...
3461sub add_spell {
3462 my ($self, $spell) = @_;
3463 $self->{spells}->{$spell->{name}} = $spell;
3464
3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492}
3493
3494sub remove_spell {
3495 my ($self, $spell) = @_;
3496 delete $self->{spells}->{$spell->{name}};
3497 $self->rebuild_spell_list;
3498}
3499
3500#############################################################################
3501
3502package CFClient::UI::Root; 3858package CFPlus::UI::Root;
3503 3859
3504our @ISA = CFClient::UI::Container::; 3860our @ISA = CFPlus::UI::Container::;
3505 3861
3506use List::Util qw(min max); 3862use List::Util qw(min max);
3507 3863
3508use CFClient::OpenGL; 3864use CFPlus::OpenGL;
3509 3865
3510sub new { 3866sub new {
3511 my $class = shift; 3867 my $class = shift;
3512 3868
3513 my $self = $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
3514 visible => 1, 3870 visible => 1,
3515 @_, 3871 @_,
3516 ); 3872 );
3517 3873
3518 Scalar::Util::weaken ($self->{root} = $self); 3874 CFPlus::weaken ($self->{root} = $self);
3519 3875
3520 $self 3876 $self
3521} 3877}
3522 3878
3523sub size_request { 3879sub size_request {
… …
3538 $coord = $max - $size if $coord > $max - $size; 3894 $coord = $max - $size if $coord > $max - $size;
3539 3895
3540 int $coord + 0.5 3896 int $coord + 0.5
3541} 3897}
3542 3898
3543sub size_allocate { 3899sub invoke_size_allocate {
3544 my ($self, $w, $h) = @_; 3900 my ($self, $w, $h) = @_;
3545 3901
3546 for my $child ($self->children) { 3902 for my $child ($self->children) {
3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3548 3904
… …
3552 $X = _to_pixel $X, $W, $self->{w}; 3908 $X = _to_pixel $X, $W, $self->{w};
3553 $Y = _to_pixel $Y, $H, $self->{h}; 3909 $Y = _to_pixel $Y, $H, $self->{h};
3554 3910
3555 $child->configure ($X, $Y, $W, $H); 3911 $child->configure ($X, $Y, $W, $H);
3556 } 3912 }
3913
3914 1
3557} 3915}
3558 3916
3559sub coord2local { 3917sub coord2local {
3560 my ($self, $x, $y) = @_; 3918 my ($self, $x, $y) = @_;
3561 3919
… …
3687 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4045 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3688 4046
3689 $w = 0 if $w < 0; 4047 $w = 0 if $w < 0;
3690 $h = 0 if $h < 0; 4048 $h = 0 if $h < 0;
3691 4049
4050 $w = max $widget->{min_w}, $w;
4051 $h = max $widget->{min_h}, $h;
4052
4053# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4054# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4055
4056 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4057 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4058
3692 $w = int $w + 0.5; 4059 $w = int $w + 0.5;
3693 $h = int $h + 0.5; 4060 $h = int $h + 0.5;
3694 4061
3695 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4062 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3696 $widget->{old_w} = $widget->{w}; 4063 $widget->{old_w} = $widget->{w};
… …
3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4086 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3720 glMatrixMode GL_MODELVIEW; 4087 glMatrixMode GL_MODELVIEW;
3721 glLoadIdentity; 4088 glLoadIdentity;
3722 4089
3723 { 4090 {
3724 package CFClient::UI::Base; 4091 package CFPlus::UI::Base;
3725 4092
3726 ($draw_x, $draw_y, $draw_w, $draw_h) = 4093 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3727 (0, 0, $self->{w}, $self->{h}); 4094 (0, 0, $self->{w}, $self->{h});
3728 }
3729 4095
3730 $self->_draw; 4096 $self->_draw;
4097 }
3731} 4098}
3732 4099
3733############################################################################# 4100#############################################################################
3734 4101
3735package CFClient::UI; 4102package CFPlus::UI;
3736 4103
3737$ROOT = new CFClient::UI::Root; 4104$ROOT = new CFPlus::UI::Root;
3738$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4105$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3739 4106
37401 41071
3741 4108

Diff Legend

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