ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.260 by elmex, Tue May 30 14:35:09 2006 UTC vs.
Revision 1.408 by root, Sun Jul 22 15:26:01 2007 UTC

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

Diff Legend

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