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.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.408 by root, Sun Jul 22 15:26:01 2007 UTC

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

Diff Legend

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