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

Diff Legend

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