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

Diff Legend

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