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

Diff Legend

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