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.264 by root, Thu Jun 1 02:58:30 2006 UTC vs.
Revision 1.392 by root, Sat Jul 21 13:37:09 2007 UTC

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

Diff Legend

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