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

Diff Legend

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