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

Diff Legend

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