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

Diff Legend

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