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

Diff Legend

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