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

Diff Legend

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