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.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.413 by root, Mon Jul 23 15:30:45 2007 UTC

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

Diff Legend

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