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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.318 by elmex, Sun Jul 2 19:32:55 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
89 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
90 90
91 $GRAB = $widget; 91 $GRAB = $widget;
92 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93 93
94 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
95 } 95 }
96 96
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 98
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
114 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 116 $grab->update if $grab;
117 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118 118
119 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
120 } 120 }
121} 121}
122 122
123sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
124 my ($ev) = @_; 124 my ($ev) = @_;
… …
130 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
131 131
132 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
133 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134 134
135 check_tooltip; 135 $TOOLTIP_WATCHER->start;
136 } 136 }
137 137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 139 if $HOVER;
140} 140}
… …
172sub rescale_widgets { 172sub rescale_widgets {
173 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
174 174
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
185 } 190 }
186 } 191 }
187 192
188 reconfigure_widgets; 193 reconfigure_widgets;
189} 194}
… …
198 203
199sub new { 204sub new {
200 my $class = shift; 205 my $class = shift;
201 206
202 my $self = bless { 207 my $self = bless {
203 x => 0, 208 x => "center",
204 y => 0, 209 y => "center",
205 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
206 can_events => 1, 213 can_events => 1,
207 @_ 214 @_
208 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 218
210 for (keys %$self) { 219 for (keys %$self) {
211 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
213 } 222 }
214 } 223 }
215 224
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
223 } 235 }
224 236
225 $self 237 $self
226} 238}
227 239
… …
232 %$self = (); 244 %$self = ();
233} 245}
234 246
235sub show { 247sub show {
236 my ($self) = @_; 248 my ($self) = @_;
249
237 return if $self->{parent}; 250 return if $self->{parent};
238 251
239 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
240} 253}
241 254
242sub show_centered { 255sub set_visible {
243 my ($self) = @_; 256 my ($self) = @_;
257
244 return if $self->{parent}; 258 return if $self->{visible};
245 259
246 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
247 262
248 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
249 "centered $self" => sub { 264
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
251 }, 266
252 ); 267 $_->set_visible for $self->children;
253} 268}
254 269
255sub set_invisible { 270sub set_invisible {
256 my ($self) = @_; 271 my ($self) = @_;
257 272
258 # broken show/hide model 273 return unless $self->{visible};
259 274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
260 delete $self->{root}; 278 delete $self->{root};
261 delete $self->{visible};
262 279
263 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
265 282
266 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
268 285
269 $self->focus_out; 286 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
270} 305}
271 306
272sub hide { 307sub hide {
273 my ($self) = @_; 308 my ($self) = @_;
274 309
… …
276 311
277 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
278 if $self->{parent}; 313 if $self->{parent};
279} 314}
280 315
281sub move { 316sub move_abs {
282 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
283 318
284 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
285 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
286 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
287 322
288 $self->update; 323 $self->update;
289} 324}
290 325
291sub set_size { 326sub set_size {
292 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
293 328
294 $self->{user_w} = $w; 329 $self->{force_w} = $w;
295 $self->{user_h} = $h; 330 $self->{force_h} = $h;
296 331
297 $self->check_size; 332 $self->realloc;
298} 333}
299 334
300sub size_request { 335sub size_request {
301 require Carp; 336 require Carp;
302 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
303} 338}
304 339
340sub baseline_shift {
341 0
342}
343
305sub configure { 344sub configure {
306 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
307 346
308 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
309 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
310 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
311 352
312 # use alignment to adjust x, y 353 # use alignment to adjust x, y
313 354
314 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
315 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
316
317 ($w, $h) = ($w2, $h2);
318 } 357 }
319 358
320 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
321 $self->{x} = $x; 360 $self->{x} = $x;
322 $self->{y} = $y; 361 $self->{y} = $y;
323 $self->update; 362 $self->update;
324 } 363 }
325 364
326 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
328 }
329}
330 367
331sub size_allocate { 368 $self->{alloc_w} = $w;
332 # nothing to be done 369 $self->{alloc_h} = $h;
333}
334 370
335sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
336 my ($self) = @_; 372 }
337
338 $self->check_size (1);
339 $self->update;
340} 373}
341 374
342sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
343} 381}
344 382
345sub set_max_size { 383sub set_max_size {
346 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
347 385
348 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
349 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
350} 390}
351 391
352sub set_tooltip { 392sub set_tooltip {
353 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
354 394
… …
359 399
360 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
361 401
362 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
363 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
364 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
365 } 405 }
366} 406}
367 407
368# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
369sub coord2local { 409sub coord2local {
… …
377 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
378 418
379 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
380} 420}
381 421
382sub focus_in { 422sub invoke_focus_in {
383 my ($self) = @_; 423 my ($self) = @_;
384 424
385 return if $FOCUS == $self; 425 return if $FOCUS == $self;
386 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
387 427
388 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
389 429
390 $self->_emit (focus_in => $focus); 430 $self->update;
391 431
392 $focus->update if $focus; 432 0
393 $FOCUS->update;
394} 433}
395 434
396sub focus_out { 435sub invoke_focus_out {
397 my ($self) = @_; 436 my ($self) = @_;
398 437
399 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
400 439
401 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
402 441
403 $self->_emit (focus_out => $focus); 442 $self->update;
404 443
405 $focus->update if $focus; #?
406
407 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
408 unless $FOCUS; 445 unless $FOCUS;
409}
410 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
411sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
412sub button_up { } 458sub invoke_button_up { 1 }
413sub key_down { } 459sub invoke_key_down { 1 }
414sub key_up { } 460sub invoke_key_up { 1 }
415 461
416sub button_down { 462sub invoke_button_down {
417 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
418 464
419 $self->focus_in; 465 $self->grab_focus;
420}
421 466
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
426sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
484
485sub find_widget {
486 my ($self, $x, $y) = @_;
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496
497sub set_parent {
498 my ($self, $parent) = @_;
499
500 Scalar::Util::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible};
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
427 535
428sub draw { 536sub draw {
429 my ($self) = @_; 537 my ($self) = @_;
430 538
431 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
432 548
433 glPushMatrix; 549 glPushMatrix;
434 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
435 $self->_draw;
436 glPopMatrix;
437 551
438 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
439 my ($x, $y) = @$self{qw(x y)};
440
441 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
442 glEnable GL_BLEND; 554 glEnable GL_BLEND;
443 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
444 glBegin GL_QUADS; 556 glBegin GL_QUADS;
445 glVertex $x , $y; 557 glVertex 0 , 0;
446 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
447 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
448 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
449 glEnd; 561 glEnd;
450 glDisable GL_BLEND; 562 glDisable GL_BLEND;
451 } 563 }
452 564
453 if ($ENV{PCLIENT_DEBUG}) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
454 glPushMatrix; 566 glPushMatrix;
455 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
457 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0; 570 glVertex 0 , 0;
459 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
460 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
461 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
462 glEnd; 574 glEnd;
463 glPopMatrix; 575 glPopMatrix;
464 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
465 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
466} 581}
467 582
468sub _draw { 583sub _draw {
469 my ($self) = @_; 584 my ($self) = @_;
470 585
471 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
472} 587}
473 588
474sub find_widget {
475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
478
479 return $self
480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483 ()
484}
485
486sub set_parent {
487 my ($self, $parent) = @_;
488
489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
499}
500
501sub check_size {
502 my ($self, $forced) = @_;
503
504 $self->{force_alloc} = 1 if $forced;
505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519}
520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
527sub emit {
528 my ($self, $signal, @args) = @_;
529
530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
532}
533
534sub DESTROY { 589sub DESTROY {
535 my ($self) = @_; 590 my ($self) = @_;
536 591
537 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
538 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
539} 596}
540 597
541############################################################################# 598#############################################################################
542 599
543package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
568 625
569 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
570 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
571 628
572 glEnable GL_BLEND; 629 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
574 glColor @$color; 631 glColor_premultiply @$color;
575 632
576 glBegin GL_QUADS; 633 glBegin GL_QUADS;
577 glVertex 0 , 0; 634 glVertex 0 , 0;
578 glVertex 0 , $h; 635 glVertex 0 , $h;
579 glVertex $w, $h; 636 glVertex $w, $h;
… …
594 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
596} 653}
597 654
598sub size_request { 655sub size_request {
599 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
600} 659}
601 660
602sub draw { } 661sub draw { }
603 662
604############################################################################# 663#############################################################################
… …
608our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
609 668
610sub new { 669sub new {
611 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
612 671
613 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
614 673
615 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
616 children => [], 675 children => [],
617 can_events => 0, 676 can_events => 0,
618 %arg, 677 %arg,
619 ); 678 );
679
620 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
621 682
622 $self 683 $self
623} 684}
624 685
625sub add { 686sub add {
… …
633 $self->{children} = [ 694 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
636 ]; 697 ];
637 698
638 $self->check_size (1); 699 $self->realloc;
639 $self->update;
640} 700}
641 701
642sub children { 702sub children {
643 @{ $_[0]{children} } 703 @{ $_[0]{children} }
644} 704}
… …
649 delete $child->{parent}; 709 delete $child->{parent};
650 $child->hide; 710 $child->hide;
651 711
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 713
654 $self->check_size (1); 714 $self->realloc;
655 $self->update;
656} 715}
657 716
658sub clear { 717sub clear {
659 my ($self) = @_; 718 my ($self) = @_;
660 719
… …
664 for (@$children) { 723 for (@$children) {
665 delete $_->{parent}; 724 delete $_->{parent};
666 $_->hide; 725 $_->hide;
667 } 726 }
668 727
669 $self->check_size; 728 $self->realloc;
670 $self->update;
671} 729}
672 730
673sub find_widget { 731sub find_widget {
674 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
675 733
676 $x -= $self->{x}; 734 $x -= $self->{x};
677 $y -= $self->{y}; 735 $y -= $self->{y};
678 736
679 my $res; 737 my $res;
680 738
681 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
682 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
683 and return $res; 741 and return $res;
684 } 742 }
685 743
686 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
707} 765}
708 766
709sub add { 767sub add {
710 my ($self, $child) = @_; 768 my ($self, $child) = @_;
711 769
712 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
713
714 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
715} 772}
716 773
717sub remove { 774sub remove {
718 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
727 784
728sub size_request { 785sub size_request {
729 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
730} 787}
731 788
732sub size_allocate { 789sub invoke_size_allocate {
733 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
734 791
735 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
736} 795}
737 796
738############################################################################# 797#############################################################################
798
799# back-buffered drawing area
739 800
740package CFClient::UI::Window; 801package CFClient::UI::Window;
741 802
742our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
743 804
… …
754 815
755 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
756 $self->SUPER::update; 817 $self->SUPER::update;
757} 818}
758 819
759sub size_allocate { 820sub invoke_size_allocate {
760 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
761 822
762 $self->SUPER::size_allocate ($w, $h);
763 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
764} 826}
765 827
766sub _render { 828sub _render {
829 my ($self) = @_;
830
767 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
768} 832}
769 833
770sub render_child { 834sub render_child {
771 my ($self) = @_; 835 my ($self) = @_;
772 836
773 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
774 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
775 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
776 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
777 $self->_render; 848 $self->_render;
778 }; 849 };
779} 850}
780 851
781sub _draw { 852sub _draw {
782 my ($self) = @_; 853 my ($self) = @_;
783 854
784 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
785 856
786 my $tex = $self->{texture} 857 my $tex = $self->{texture}
787 or return; 858 or return;
788 859
789 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
790 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
791 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
792 863
793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
794 865
795 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
796} 867}
… …
812} 883}
813 884
814sub size_request { 885sub size_request {
815 my ($self) = @_; 886 my ($self) = @_;
816 887
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818 889
819 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
820} 891 $h = 10 if $self->{scroll_y};
821 892
893 ($w, $h)
894}
895
822sub size_allocate { 896sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
824 898
899 my $child = $self->child;
900
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827 903
828 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
829 $self->update; 905 $self->update;
906
907 1
830} 908}
831 909
832sub set_offset { 910sub set_offset {
833 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
834 912
… …
867} 945}
868 946
869sub _render { 947sub _render {
870 my ($self) = @_; 948 my ($self) = @_;
871 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
872 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873 954
874 $self->SUPER::_render; 955 $self->SUPER::_render;
875} 956}
876 957
… …
879package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
880 961
881our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
882 963
883sub new { 964sub new {
884 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
885 968
886 my $self; 969 my $self;
887 970
888 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
889 vertical => 1, 972 vertical => 1,
… …
894 ; 977 ;
895 978
896 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
897 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
898 slider => $slider, 981 slider => $slider,
899 @_, 982 %arg,
900 ); 983 );
901 984
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
905 987
906 $self 988 $self
907} 989}
908 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
909sub update { 1005sub update {
910 my ($self) = @_; 1006 my ($self) = @_;
911 1007
912 $self->SUPER::update; 1008 $self->SUPER::update;
913 1009
914 # todo: overwrite size_allocate of child 1010 $self->update_slider;
915 my $child = $self->{vp}->child;
916 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
917} 1011}
918 1012
919sub size_allocate { 1013sub invoke_size_allocate {
920 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
921 1015
1016 $self->update_slider;
1017
922 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
923
924 my $child = $self->{vp}->child;
925 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
926} 1019}
927
928#TODO# update range on size_allocate depending on child
929# update viewport offset on scroll
930 1020
931############################################################################# 1021#############################################################################
932 1022
933package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
934 1024
… …
950 1040
951 if ($self->{bg}) { 1041 if ($self->{bg}) {
952 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
953 1043
954 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
956 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
957 1047
958 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
959 glVertex 0 , 0; 1049 glVertex 0 , 0;
960 glVertex 0 , $h; 1050 glVertex 0 , $h;
961 glVertex $w, $h; 1051 glVertex $w, $h;
… …
974 1064
975our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
976 1066
977use CFClient::OpenGL; 1067use CFClient::OpenGL;
978 1068
979my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982 1076
983sub new { 1077sub new {
984 my $class = shift; 1078 my ($class, %arg) = @_;
985
986 # TODO: user_x, user_y, overwrite moveto?
987 1079
988 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1083 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1084 can_events => 1,
994 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
995 ); 1088 );
996 1089
997 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
998 align => 0, 1091 align => 0,
999 valign => 1, 1092 valign => 1,
1000 text => $self->{title}, 1093 text => $self->{title},
1001 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1002 1105
1003 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1004} 1115}
1005 1116
1006sub border { 1117sub border {
1007 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1008} 1119}
1009 1120
1010sub size_request { 1121sub size_request {
1011 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1012 1129
1013 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1014 1131
1015 ( 1132 (
1016 $w + $self->border * 2, 1133 $w + $self->border * 2,
1017 $h + $self->border * 2, 1134 $h + $self->border * 2,
1018 ) 1135 )
1019} 1136}
1020 1137
1021sub size_allocate { 1138sub invoke_size_allocate {
1022 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1023 1140
1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1146
1147 my $border = $self->border;
1148
1024 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1026 1151
1027 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028 if $self->{title};
1029
1030 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1031}
1032 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1165 1
1166}
1167
1033sub button_down { 1168sub invoke_button_down {
1034 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1035 1170
1036 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1037 my $border = $self->border; 1172 my $border = $self->border;
1038 1173
… …
1051 my ($ev, $x, $y) = @_; 1186 my ($ev, $x, $y) = @_;
1052 1187
1053 my $dx = $ev->{x} - $ox; 1188 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
1055 1190
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y}); 1193
1061 $self->check_size; 1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1195 $self->realloc;
1062 }; 1196 };
1063 1197
1064 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
1065 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066 my ($bx, $by) = ($self->{x}, $self->{y}); 1200 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1068 $self->{motion} = sub { 1202 $self->{motion} = sub {
1069 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
1070 1204
1071 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1072 1206
1073 $self->{user_x} = $bx + $x - $ox; 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1074 $self->{user_y} = $by + $y - $oy; 1208 # HACK: the next line is required to enforce placement
1075 $self->move ($self->{user_x}, $self->{user_y}); 1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1076 $self->update;
1077 }; 1210 };
1211 } else {
1212 return 0;
1213 }
1214
1078 } 1215 1
1079} 1216}
1080 1217
1081sub button_up { 1218sub invoke_button_up {
1082 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1083 1220
1084 delete $self->{motion}; 1221 ! ! delete $self->{motion}
1085} 1222}
1086 1223
1087sub mouse_motion { 1224sub invoke_mouse_motion {
1088 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1089 1226
1090 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228
1229 ! ! $self->{motion}
1091} 1230}
1092 1231
1093sub _draw { 1232sub _draw {
1094 my ($self) = @_; 1233 my ($self) = @_;
1095 1234
1235 my $child = $self->{children}[0];
1236
1096 my ($w, $h ) = ($self->{w}, $self->{h}); 1237 my ($w, $h ) = ($self->{w}, $self->{h});
1097 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1238 my ($cw, $ch) = ($child->{w}, $child->{h});
1098 1239
1099 glEnable GL_TEXTURE_2D; 1240 glEnable GL_TEXTURE_2D;
1100 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101 1242
1102 my $border = $self->border; 1243 my $border = $self->border;
1103 1244
1104 glColor @{ $self->{border_bg} }; 1245 glColor @{ $self->{border_bg} };
1105 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1246 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1106 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1247 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1248 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1249 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109 1250
1110 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1251 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111 my $bg = $tex[0]; 1252 glColor @{ $self->{bg} };
1112 1253
1113 # TODO: repeat texture not scale 1254 # TODO: repeat texture not scale
1255 # solve this better(?)
1114 my $rep_x = $cw / $bg->{w}; 1256 $bg->{s} = $cw / $bg->{w};
1115 my $rep_y = $ch / $bg->{h}; 1257 $bg->{t} = $ch / $bg->{h};
1116
1117 glColor @{ $self->{bg} };
1118
1119 $bg->{s} = $rep_x;
1120 $bg->{t} = $rep_y;
1121 $bg->{wrap_mode} = 1;
1122 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1258 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123 } 1259 }
1124 1260
1125 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1126 1262
1127 $self->{title}->draw if $self->{title};
1128
1129 $self->child->draw; 1263 $child->draw;
1264
1265 if ($self->{title_widget}) {
1266 glTranslate 0, $border - $self->{h};
1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1130} 1274}
1131 1275
1132############################################################################# 1276#############################################################################
1133 1277
1134package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1156 my ($self, $x, $y, $child) = @_; 1300 my ($self, $x, $y, $child) = @_;
1157 1301
1158 $child->set_parent ($self); 1302 $child->set_parent ($self);
1159 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1160 1304
1161 $self->check_size (1); 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1162} 1312}
1163 1313
1164# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1165sub clear { 1315sub clear {
1166 my ($self) = @_; 1316 my ($self) = @_;
… …
1171 for (@children) { 1321 for (@children) {
1172 delete $_->{parent}; 1322 delete $_->{parent};
1173 $_->hide; 1323 $_->hide;
1174 } 1324 }
1175 1325
1176 $self->check_size (1); 1326 $self->realloc;
1177 $self->update;
1178} 1327}
1179 1328
1180sub get_wh { 1329sub get_wh {
1181 my ($self) = @_; 1330 my ($self) = @_;
1182 1331
… …
1208 (sum @$ws), 1357 (sum @$ws),
1209 (sum @$hs), 1358 (sum @$hs),
1210 ) 1359 )
1211} 1360}
1212 1361
1213sub size_allocate { 1362sub invoke_size_allocate {
1214 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1215 1364
1216 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1217 1366
1218 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
… …
1250 } 1399 }
1251 1400
1252 $y += $row_h; 1401 $y += $row_h;
1253 } 1402 }
1254 1403
1404 1
1255} 1405}
1256 1406
1257sub find_widget { 1407sub find_widget {
1258 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1259 1409
… …
1278 } 1428 }
1279} 1429}
1280 1430
1281############################################################################# 1431#############################################################################
1282 1432
1433package CFClient::UI::Box;
1434
1435our @ISA = CFClient::UI::Container::;
1436
1437sub size_request {
1438 my ($self) = @_;
1439
1440 $self->{vertical}
1441 ? (
1442 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1443 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1444 )
1445 : (
1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1448 )
1449}
1450
1451sub invoke_size_allocate {
1452 my ($self, $w, $h) = @_;
1453
1454 my $space = $self->{vertical} ? $h : $w;
1455 my @children = $self->visible_children;
1456
1457 my @req;
1458
1459 if ($self->{homogeneous}) {
1460 @req = ($space / (@children || 1)) x @children;
1461 } else {
1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1463 my $req = List::Util::sum @req;
1464
1465 if ($req > $space) {
1466 # ah well, not enough space
1467 $_ *= $space / $req for @req;
1468 } else {
1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1470
1471 $space = ($space - $req) / $expand; # remaining space to give away
1472
1473 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children;
1475 }
1476 }
1477
1478 CFClient::UI::harmonize \@req;
1479
1480 my $pos = 0;
1481 for (0 .. $#children) {
1482 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1484
1485 $pos += $alloc;
1486 }
1487
1488 1
1489}
1490
1491#############################################################################
1492
1283package CFClient::UI::HBox; 1493package CFClient::UI::HBox;
1284 1494
1285# TODO: wrap into common Box base class
1286
1287our @ISA = CFClient::UI::Container::; 1495our @ISA = CFClient::UI::Box::;
1288 1496
1289sub size_request { 1497sub new {
1290 my ($self) = @_; 1498 my $class = shift;
1291 1499
1292 my @alloc = map [$_->size_request], @{$self->{children}}; 1500 $class->SUPER::new (
1293 1501 vertical => 0,
1294 ( 1502 @_,
1295 (List::Util::sum map $_->[0], @alloc),
1296 (List::Util::max map $_->[1], @alloc),
1297 ) 1503 )
1298} 1504}
1299 1505
1300sub size_allocate {
1301 my ($self, $w, $h) = @_;
1302
1303 ($h, $w) = ($w, $h);
1304
1305 my $children = $self->{children};
1306
1307 my @h = map $_->{req_w}, @$children;
1308
1309 my $req_h = List::Util::sum @h;
1310
1311 if ($req_h > $h) {
1312 # ah well, not enough space
1313 $_ *= $h / $req_h for @h;
1314 } else {
1315 my $exp = List::Util::sum map $_->{expand}, @$children;
1316 $exp ||= 1;
1317
1318 for (0 .. $#$children) {
1319 my $child = $children->[$_];
1320
1321 my $alloc_h = $h[$_];
1322 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323 $h[$_] = $alloc_h;
1324 }
1325 }
1326
1327 CFClient::UI::harmonize \@h;
1328
1329 my $y = 0;
1330 for (0 .. $#$children) {
1331 my $child = $children->[$_];
1332 my $h = $h[$_];
1333 $child->configure ($y, 0, $h, $w);
1334
1335 $y += $h;
1336 }
1337
1338 1
1339}
1340
1341############################################################################# 1506#############################################################################
1342 1507
1343package CFClient::UI::VBox; 1508package CFClient::UI::VBox;
1344 1509
1345# TODO: wrap into common Box base class
1346
1347our @ISA = CFClient::UI::Container::; 1510our @ISA = CFClient::UI::Box::;
1348 1511
1349sub size_request { 1512sub new {
1350 my ($self) = @_; 1513 my $class = shift;
1351 1514
1352 my @alloc = map [$_->size_request], @{$self->{children}}; 1515 $class->SUPER::new (
1353 1516 vertical => 1,
1354 ( 1517 @_,
1355 (List::Util::max map $_->[0], @alloc),
1356 (List::Util::sum map $_->[1], @alloc),
1357 ) 1518 )
1358}
1359
1360sub size_allocate {
1361 my ($self, $w, $h) = @_;
1362
1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365 my $children = $self->{children};
1366
1367 my @h = map $_->{req_h}, @$children;
1368
1369 my $req_h = List::Util::sum @h;
1370
1371 if ($req_h > $h) {
1372 # ah well, not enough space
1373 $_ *= $h / $req_h for @h;
1374 } else {
1375 my $exp = List::Util::sum map $_->{expand}, @$children;
1376 $exp ||= 1;
1377
1378 for (0 .. $#$children) {
1379 my $child = $children->[$_];
1380
1381 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382 }
1383 }
1384
1385 CFClient::UI::harmonize \@h;
1386
1387 my $y = 0;
1388 for (0 .. $#$children) {
1389 my $child = $children->[$_];
1390 my $h = $h[$_];
1391 $child->configure (0, $y, $w, $h);
1392
1393 $y += $h;
1394 }
1395
1396 1
1397} 1519}
1398 1520
1399############################################################################# 1521#############################################################################
1400 1522
1401package CFClient::UI::Label; 1523package CFClient::UI::Label;
… …
1418 ellipsise => 3, # end 1540 ellipsise => 3, # end
1419 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout),
1420 fontsize => 1, 1542 fontsize => 1,
1421 align => -1, 1543 align => -1,
1422 valign => -1, 1544 valign => -1,
1423 padding => 2, 1545 padding_x => 2,
1546 padding_y => 2,
1424 can_events => 0, 1547 can_events => 0,
1425 %arg 1548 %arg
1426 ); 1549 );
1427 1550
1428 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
… …
1455 1578
1456 delete $self->{texture}; 1579 delete $self->{texture};
1457 $self->SUPER::update; 1580 $self->SUPER::update;
1458} 1581}
1459 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1460sub set_text { 1590sub set_text {
1461 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1462 1592
1463 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1464 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1465 1595
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467 $self->{layout}->set_text ($text); 1597 $self->{layout}->set_text ($text);
1468 1598
1599 delete $self->{size_req};
1600 $self->realloc;
1469 $self->update; 1601 $self->update;
1470 $self->check_size;
1471} 1602}
1472 1603
1473sub set_markup { 1604sub set_markup {
1474 my ($self, $markup) = @_; 1605 my ($self, $markup) = @_;
1475 1606
… …
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1610 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480 1611
1481 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1482 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1483 1614
1615 delete $self->{size_req};
1616 $self->realloc;
1484 $self->update; 1617 $self->update;
1485 $self->check_size;
1486} 1618}
1487 1619
1488sub size_request { 1620sub size_request {
1489 my ($self) = @_; 1621 my ($self) = @_;
1490 1622
1623 $self->{size_req} ||= do {
1491 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1492 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1493 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1494 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1495 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1496 1629
1497 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1498 1631
1499 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1500 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1501 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1502 1635
1503 my ($w2, $h2) = $self->{template}->size; 1636 my ($w2, $h2) = $self->{template}->size;
1504 1637
1505 $w = List::Util::max $w, $w2; 1638 $w = List::Util::max $w, $w2;
1506 $h = List::Util::max $h, $h2; 1639 $h = List::Util::max $h, $h2;
1640 }
1641
1642 [$w, $h]
1507 } 1643 };
1508 1644
1509 ( 1645 @{ $self->{size_req} }
1510 $w + $self->{padding} * 2,
1511 $h + $self->{padding} * 2,
1512 )
1513} 1646}
1514 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1515sub size_allocate { 1652sub invoke_size_allocate {
1516 my ($self, $w, $h) = @_; 1653 my ($self, $w, $h) = @_;
1517 1654
1655 delete $self->{ox};
1656
1518 delete $self->{texture}; 1657 delete $self->{texture}
1658 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1659
1660 1
1519} 1661}
1520 1662
1521sub set_fontsize { 1663sub set_fontsize {
1522 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1523 1665
1524 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1525 delete $self->{texture}; 1668 delete $self->{texture};
1526 1669
1527 $self->update; 1670 $self->realloc;
1528 $self->check_size; 1671}
1672
1673sub reconfigure {
1674 my ($self) = @_;
1675
1676 delete $self->{size_req};
1677
1678 $self->SUPER::reconfigure;
1529} 1679}
1530 1680
1531sub _draw { 1681sub _draw {
1532 my ($self) = @_; 1682 my ($self) = @_;
1533 1683
… …
1539 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1540 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1541 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543 1693
1544 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1694 new_from_layout CFClient::Texture $self->{layout}
1695 };
1545 1696
1697 unless (exists $self->{ox}) {
1546 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $tex->{w}) * 0.5);
1549 1701
1550 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $tex->{h}) * 0.5);
1553
1554 $tex
1555 }; 1705 };
1556 1706
1557 glEnable GL_TEXTURE_2D; 1707 glEnable GL_TEXTURE_2D;
1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1559 1711
1560 if ($tex->{format} == GL_ALPHA) { 1712 if ($tex->{format} == GL_ALPHA) {
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1561 glColor @{$self->{fg}}; 1714 glColor @{$self->{fg}};
1562 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1563 } else { 1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1565 } 1719 }
1566 1720
1567 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1568} 1722}
1569 1723
… …
1586 can_hover => 1, 1740 can_hover => 1,
1587 can_focus => 1, 1741 can_focus => 1,
1588 valign => 0, 1742 valign => 0,
1589 can_events => 1, 1743 can_events => 1,
1590 #text => ... 1744 #text => ...
1745 #hidden => "*",
1591 @_ 1746 @_
1592 ) 1747 )
1593} 1748}
1594 1749
1595sub _set_text { 1750sub _set_text {
… …
1597 1752
1598 delete $self->{cur_h}; 1753 delete $self->{cur_h};
1599 1754
1600 return if $self->{text} eq $text; 1755 return if $self->{text} eq $text;
1601 1756
1602 delete $self->{texture};
1603
1604 $self->{last_activity} = $::NOW; 1757 $self->{last_activity} = $::NOW;
1605 $self->{text} = $text; 1758 $self->{text} = $text;
1606 1759
1607 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1608 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1762 delete $self->{size_req};
1609 1763
1610 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1765
1766 $self->realloc;
1767 $self->update;
1611} 1768}
1612 1769
1613sub set_text { 1770sub set_text {
1614 my ($self, $text) = @_; 1771 my ($self, $text) = @_;
1615 1772
1616 $self->{cursor} = length $text; 1773 $self->{cursor} = length $text;
1617 $self->_set_text ($text); 1774 $self->_set_text ($text);
1618 $self->update;
1619 $self->check_size;
1620} 1775}
1621 1776
1622sub get_text { 1777sub get_text {
1623 $_[0]{text} 1778 $_[0]{text}
1624} 1779}
… …
1629 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1630 1785
1631 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1632} 1787}
1633 1788
1634sub key_down { 1789sub invoke_key_down {
1635 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1636 1791
1637 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1638 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1639 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
… …
1651 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1652 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1653 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1654 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1655 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1656 $self->_emit ('escape'); 1811 $self->emit ('escape');
1657 } elsif ($uni) { 1812 } elsif ($uni) {
1658 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1814 } else {
1815 return 0;
1659 } 1816 }
1660 1817
1661 $self->_set_text ($text); 1818 $self->_set_text ($text);
1662 $self->update;
1663 $self->check_size;
1664}
1665 1819
1820 $self->realloc;
1821
1822 1
1823}
1824
1666sub focus_in { 1825sub invoke_focus_in {
1667 my ($self) = @_; 1826 my ($self) = @_;
1668 1827
1669 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1670 1829
1671 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1672} 1831}
1673 1832
1674sub button_down { 1833sub invoke_button_down {
1675 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1676 1835
1677 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1678 1837
1679 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1680 1839
1681 # byte-index to char-index 1840 # byte-index to char-index
1682 my $text = $self->{text}; 1841 my $text = $self->{text};
1683 utf8::encode $text; 1842 utf8::encode $text;
1684 $self->{cursor} = length substr $text, 0, $idx; 1843 $self->{cursor} = length substr $text, 0, $idx;
1685 1844
1686 $self->_set_text ($self->{text}); 1845 $self->_set_text ($self->{text});
1687 $self->update; 1846 $self->update;
1847
1848 1
1688} 1849}
1689 1850
1690sub mouse_motion { 1851sub invoke_mouse_motion {
1691 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1692# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1853# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1854
1855 1
1693} 1856}
1694 1857
1695sub _draw { 1858sub _draw {
1696 my ($self) = @_; 1859 my ($self) = @_;
1697 1860
1698 local $self->{fg} = $self->{fg}; 1861 local $self->{fg} = $self->{fg};
1699 1862
1700 if ($FOCUS == $self) { 1863 if ($FOCUS == $self) {
1701 glColor @{$self->{active_bg}}; 1864 glColor_premultiply @{$self->{active_bg}};
1702 $self->{fg} = $self->{active_fg}; 1865 $self->{fg} = $self->{active_fg};
1703 } else { 1866 } else {
1704 glColor @{$self->{bg}}; 1867 glColor_premultiply @{$self->{bg}};
1705 } 1868 }
1706 1869
1707 glEnable GL_BLEND; 1870 glEnable GL_BLEND;
1708 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1871 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1709 glBegin GL_QUADS; 1872 glBegin GL_QUADS;
1710 glVertex 0 , 0; 1873 glVertex 0 , 0;
1711 glVertex 0 , $self->{h}; 1874 glVertex 0 , $self->{h};
1712 glVertex $self->{w}, $self->{h}; 1875 glVertex $self->{w}, $self->{h};
1713 glVertex $self->{w}, 0; 1876 glVertex $self->{w}, 0;
… …
1738 1901
1739our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1740 1903
1741use CFClient::OpenGL; 1904use CFClient::OpenGL;
1742 1905
1743sub key_down { 1906sub invoke_key_down {
1744 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1745 1908
1746 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1747 1910
1748 if ($sym == 13) { 1911 if ($sym == 13) {
1749 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1750 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1751 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1752 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1753 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1754 $self->update; 1918 $self->update;
1755 1919
1756 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1757 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1758 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
… …
1774 } else { 1938 } else {
1775 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1776 } 1940 }
1777 1941
1778 } else { 1942 } else {
1779 $self->SUPER::key_down ($ev); 1943 return $self->SUPER::invoke_key_down ($ev)
1944 }
1945
1780 } 1946 1
1781
1782} 1947}
1783 1948
1784############################################################################# 1949#############################################################################
1785 1950
1786package CFClient::UI::Button; 1951package CFClient::UI::Button;
… …
1795 1960
1796sub new { 1961sub new {
1797 my $class = shift; 1962 my $class = shift;
1798 1963
1799 $class->SUPER::new ( 1964 $class->SUPER::new (
1800 padding => 4, 1965 padding_x => 4,
1966 padding_y => 4,
1801 fg => [1, 1, 1], 1967 fg => [1, 1, 1],
1802 active_fg => [0, 0, 1], 1968 active_fg => [0, 0, 1],
1803 can_hover => 1, 1969 can_hover => 1,
1804 align => 0, 1970 align => 0,
1805 valign => 0, 1971 valign => 0,
1806 can_events => 1, 1972 can_events => 1,
1807 @_ 1973 @_
1808 ) 1974 )
1809} 1975}
1810 1976
1811sub activate { }
1812
1813sub button_up { 1977sub invoke_button_up {
1814 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1815 1979
1816 $self->emit ("activate") 1980 $self->emit ("activate")
1817 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1818 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
1983
1984 1
1819} 1985}
1820 1986
1821sub _draw { 1987sub _draw {
1822 my ($self) = @_; 1988 my ($self) = @_;
1823 1989
1824 local $self->{fg} = $self->{fg}; 1990 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1825
1826 if ($GRAB == $self) {
1827 $self->{fg} = $self->{active_fg};
1828 }
1829 1991
1830 glEnable GL_TEXTURE_2D; 1992 glEnable GL_TEXTURE_2D;
1831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1832 glColor 0, 0, 0, 1; 1994 glColor 0, 0, 0, 1;
1833 1995
… …
1838 $self->SUPER::_draw; 2000 $self->SUPER::_draw;
1839} 2001}
1840 2002
1841############################################################################# 2003#############################################################################
1842 2004
2005package CFClient::UI::ImageButton;
2006
2007our @ISA = CFClient::UI::Image::;
2008
2009use CFClient::OpenGL;
2010
2011my %textures;
2012
2013sub new {
2014 my $class = shift;
2015
2016 my $self = $class->SUPER::new (
2017 padding_x => 4,
2018 padding_y => 4,
2019 fg => [1, 1, 1],
2020 active_fg => [0, 0, 1],
2021 can_hover => 1,
2022 align => 0,
2023 valign => 0,
2024 can_events => 1,
2025 @_
2026 );
2027}
2028
2029sub invoke_button_up {
2030 my ($self, $ev, $x, $y) = @_;
2031
2032 $self->emit ("activate")
2033 if $x >= 0 && $x < $self->{w}
2034 && $y >= 0 && $y < $self->{h};
2035
2036 1
2037}
2038
2039#############################################################################
2040
1843package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
1844 2042
1845our @ISA = CFClient::UI::DrawBG::; 2043our @ISA = CFClient::UI::DrawBG::;
1846 2044
1847my @tex = 2045my @tex =
… …
1852 2050
1853sub new { 2051sub new {
1854 my $class = shift; 2052 my $class = shift;
1855 2053
1856 $class->SUPER::new ( 2054 $class->SUPER::new (
1857 padding => 2, 2055 padding_x => 2,
2056 padding_y => 2,
1858 fg => [1, 1, 1], 2057 fg => [1, 1, 1],
1859 active_fg => [1, 1, 0], 2058 active_fg => [1, 1, 0],
1860 bg => [0, 0, 0, 0.2], 2059 bg => [0, 0, 0, 0.2],
1861 active_bg => [1, 1, 1, 0.5], 2060 active_bg => [1, 1, 1, 0.5],
1862 state => 0, 2061 state => 0,
… …
1866} 2065}
1867 2066
1868sub size_request { 2067sub size_request {
1869 my ($self) = @_; 2068 my ($self) = @_;
1870 2069
1871 ($self->{padding} * 2 + 6) x 2 2070 (6) x 2
1872} 2071}
1873 2072
1874sub button_down { 2073sub invoke_button_down {
1875 my ($self, $ev, $x, $y) = @_; 2074 my ($self, $ev, $x, $y) = @_;
1876 2075
1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2076 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2077 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879 $self->{state} = !$self->{state}; 2078 $self->{state} = !$self->{state};
1880 $self->_emit (changed => $self->{state}); 2079 $self->emit (changed => $self->{state});
2080 } else {
2081 return 0
2082 }
2083
1881 } 2084 1
1882} 2085}
1883 2086
1884sub _draw { 2087sub _draw {
1885 my ($self) = @_; 2088 my ($self) = @_;
1886 2089
1887 $self->SUPER::_draw; 2090 $self->SUPER::_draw;
1888 2091
1889 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2092 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890 2093
1891 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2094 my ($w, $h) = @$self{qw(w h)};
2095
2096 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1892 2097
1893 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2098 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894 2099
1895 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2100 my $tex = $self->{state} ? $tex[1] : $tex[0];
1896 2101
… …
1904package CFClient::UI::Image; 2109package CFClient::UI::Image;
1905 2110
1906our @ISA = CFClient::UI::Base::; 2111our @ISA = CFClient::UI::Base::;
1907 2112
1908use CFClient::OpenGL; 2113use CFClient::OpenGL;
1909use Carp qw/confess/;
1910 2114
1911our %loaded_images; 2115our %texture_cache;
1912 2116
1913sub new { 2117sub new {
1914 my $class = shift; 2118 my $class = shift;
1915 2119
1916 my $self = $class->SUPER::new (can_events => 0, @_); 2120 my $self = $class->SUPER::new (
2121 can_events => 0,
2122 @_,
2123 );
1917 2124
1918 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2125 $self->{path}
2126 or Carp::croak "required attribute 'path' not set";
1919 2127
1920 $loaded_images{$self->{image}} ||= 2128 $self->{tex} = $texture_cache{$self->{path}} ||=
1921 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2129 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1922 2130
1923 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2131 Scalar::Util::weaken $texture_cache{$self->{path}};
1924 2132
1925 Scalar::Util::weaken $loaded_images{$self->{image}}; 2133 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1926
1927 $self->{aspect} = $tex->{w} / $tex->{h};
1928 2134
1929 $self 2135 $self
1930} 2136}
1931 2137
1932sub size_request { 2138sub size_request {
1933 my ($self) = @_; 2139 my ($self) = @_;
1934 2140
1935 ($self->{tex}->{w}, $self->{tex}->{h}) 2141 ($self->{tex}{w}, $self->{tex}{h})
1936} 2142}
1937 2143
1938sub _draw { 2144sub _draw {
1939 my ($self) = @_; 2145 my ($self) = @_;
1940 2146
… …
2049 my $ycut1 = max 0, min 1, $ycut; 2255 my $ycut1 = max 0, min 1, $ycut;
2050 my $ycut2 = max 0, min 1, $ycut - 1; 2256 my $ycut2 = max 0, min 1, $ycut - 1;
2051 2257
2052 my $h1 = $self->{h} * (1 - $ycut1); 2258 my $h1 = $self->{h} * (1 - $ycut1);
2053 my $h2 = $self->{h} * (1 - $ycut2); 2259 my $h2 = $self->{h} * (1 - $ycut2);
2260 my $h3 = $self->{h};
2261
2262 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2054 2263
2055 glEnable GL_BLEND; 2264 glEnable GL_BLEND;
2056 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2265 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2266 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2057 glEnable GL_TEXTURE_2D; 2267 glEnable GL_TEXTURE_2D;
2058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2268 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2059 2269
2060 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2270 glBindTexture GL_TEXTURE_2D, $t1->{name};
2061 glBegin GL_QUADS; 2271 glBegin GL_QUADS;
… …
2076 2286
2077 if ($t3) { 2287 if ($t3) {
2078 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2288 glBindTexture GL_TEXTURE_2D, $t3->{name};
2079 glBegin GL_QUADS; 2289 glBegin GL_QUADS;
2080 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2290 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2081 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2291 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2082 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2292 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2083 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2293 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2084 glEnd; 2294 glEnd;
2085 } 2295 }
2086 2296
2087 glDisable GL_BLEND; 2297 glDisable GL_BLEND;
… …
2161 fg => [1, 1, 1], 2371 fg => [1, 1, 1],
2162 active_fg => [0, 0, 0], 2372 active_fg => [0, 0, 0],
2163 bg => [0, 0, 0, 0.2], 2373 bg => [0, 0, 0, 0.2],
2164 active_bg => [1, 1, 1, 0.5], 2374 active_bg => [1, 1, 1, 0.5],
2165 range => [0, 0, 100, 10, 0], 2375 range => [0, 0, 100, 10, 0],
2166 req_w => $::WIDTH / 80, 2376 min_w => $::WIDTH / 80,
2167 req_h => $::WIDTH / 80, 2377 min_h => $::WIDTH / 80,
2168 vertical => 0, 2378 vertical => 0,
2169 can_hover => 1, 2379 can_hover => 1,
2170 inner_pad => 0.02, 2380 inner_pad => 0.02,
2171 @_ 2381 @_
2172 ); 2382 );
… …
2180sub set_range { 2390sub set_range {
2181 my ($self, $range) = @_; 2391 my ($self, $range) = @_;
2182 2392
2183 ($range, $self->{range}) = ($self->{range}, $range); 2393 ($range, $self->{range}) = ($self->{range}, $range);
2184 2394
2185 $self->update
2186 if "@$range" ne "@{$self->{range}}"; 2395 if ("@$range" ne "@{$self->{range}}") {
2396 $self->update;
2397 $self->set_value ($self->{range}[0]);
2398 }
2187} 2399}
2188 2400
2189sub set_value { 2401sub set_value {
2190 my ($self, $value) = @_; 2402 my ($self, $value) = @_;
2191 2403
… …
2202 if $unit; 2414 if $unit;
2203 2415
2204 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2416 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2205 2417
2206 if ($value != $old_value) { 2418 if ($value != $old_value) {
2207 $self->_emit (changed => $value); 2419 $self->emit (changed => $value);
2208 $self->update; 2420 $self->update;
2209 } 2421 }
2210} 2422}
2211 2423
2212sub size_request { 2424sub size_request {
2213 my ($self) = @_; 2425 my ($self) = @_;
2214 2426
2215 my $w = $self->{req_w}; 2427 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2428}
2220 2429
2221sub button_down { 2430sub invoke_button_down {
2222 my ($self, $ev, $x, $y) = @_; 2431 my ($self, $ev, $x, $y) = @_;
2223 2432
2224 $self->SUPER::button_down ($ev, $x, $y); 2433 $self->SUPER::invoke_button_down ($ev, $x, $y);
2225 2434
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2435 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2436
2228 $self->mouse_motion ($ev, $x, $y); 2437 $self->invoke_mouse_motion ($ev, $x, $y)
2229} 2438}
2230 2439
2231sub mouse_motion { 2440sub invoke_mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2233 2442
2234 if ($GRAB == $self) { 2443 if ($GRAB == $self) {
2235 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2444 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2236 2445
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2446 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2447
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2448 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2449
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2450 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2451 } else {
2452 return 0;
2453 }
2454
2242 } 2455 1
2243} 2456}
2244 2457
2245sub update { 2458sub update {
2246 my ($self) = @_; 2459 my ($self) = @_;
2247 2460
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2461 delete $self->{knob_w};
2462 $self->SUPER::update;
2463}
2464
2465sub _draw {
2466 my ($self) = @_;
2467
2468 unless ($self->{knob_w}) {
2249 $self->set_value ($self->{range}[0]); 2469 $self->set_value ($self->{range}[0]);
2250 2470
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2471 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2472 my $range = ($hi - $page - $lo) || 1e-100;
2253 2473
… …
2259 $value = ($value - $lo) / $range; 2479 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2480 $value = $value * $self->{scale} + $self->{offset};
2261 2481
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2482 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2483 $self->{knob_w} = $knob_w;
2264 }); 2484 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2485
2272 $self->SUPER::_draw (); 2486 $self->SUPER::_draw ();
2273 2487
2274 glScale $self->{w}, $self->{h}; 2488 glScale $self->{w}, $self->{h};
2275 2489
… …
2336sub set_range { shift->{slider}->set_range (@_) } 2550sub set_range { shift->{slider}->set_range (@_) }
2337sub set_value { shift->{slider}->set_value (@_) } 2551sub set_value { shift->{slider}->set_value (@_) }
2338 2552
2339############################################################################# 2553#############################################################################
2340 2554
2341package CFClient::UI::TextView; 2555package CFClient::UI::TextScroller;
2342 2556
2343our @ISA = CFClient::UI::HBox::; 2557our @ISA = CFClient::UI::HBox::;
2344 2558
2345use CFClient::OpenGL; 2559use CFClient::OpenGL;
2346 2560
… …
2348 my $class = shift; 2562 my $class = shift;
2349 2563
2350 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2351 fontsize => 1, 2565 fontsize => 1,
2352 can_events => 0, 2566 can_events => 0,
2567 indent => 0,
2353 #font => default_font 2568 #font => default_font
2354 @_, 2569 @_,
2355 2570
2356 layout => (new CFClient::Layout 1), 2571 layout => (new CFClient::Layout 1),
2357 par => [], 2572 par => [],
… …
2372 2587
2373 $self->{fontsize} = $fontsize; 2588 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2589 $self->reflow;
2375} 2590}
2376 2591
2592sub size_request {
2593 my ($self) = @_;
2594
2595 my ($empty, $slider) = @{ $self->{children} };
2596
2597 local $self->{children} = [$empty, $slider];
2598 $self->SUPER::size_request
2599}
2600
2377sub size_allocate { 2601sub invoke_size_allocate {
2378 my ($self, $w, $h) = @_; 2602 my ($self, $w, $h) = @_;
2379 2603
2380 $self->SUPER::size_allocate ($w, $h); 2604 my ($empty, $slider, @other) = @{ $self->{children} };
2605 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2381 2606
2382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2607 $self->{layout}->set_font ($self->{font}) if $self->{font};
2383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2608 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2384 $self->{layout}->set_width ($self->{children}[0]{w}); 2609 $self->{layout}->set_width ($empty->{w});
2610 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2385 2611
2386 $self->reflow; 2612 $self->reflow;
2387}
2388 2613
2389sub text_size { 2614 local $self->{children} = [$empty, $slider];
2390 my ($self, $text, $indent) = @_; 2615 $self->SUPER::invoke_size_allocate ($w, $h)
2616}
2617
2618sub get_layout {
2619 my ($self, $para) = @_;
2391 2620
2392 my $layout = $self->{layout}; 2621 my $layout = $self->{layout};
2393 2622
2623 $layout->set_font ($self->{font}) if $self->{font};
2624 $layout->set_foreground (@{$para->{fg}});
2394 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2625 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $layout->set_width ($self->{children}[0]{w} - $indent); 2626 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2627 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 $layout->set_markup ($text); 2628 $layout->set_markup ($para->{markup});
2629
2630 $layout->set_shapes (
2631 map
2632 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2633 @{$para->{widget}}
2397 2634 );
2635
2398 $layout->size 2636 $layout
2399} 2637}
2400 2638
2401sub reflow { 2639sub reflow {
2402 my ($self) = @_; 2640 my ($self) = @_;
2403 2641
… …
2412 $self->{children}[1]->set_value ($offset); 2650 $self->{children}[1]->set_value ($offset);
2413} 2651}
2414 2652
2415sub clear { 2653sub clear {
2416 my ($self) = @_; 2654 my ($self) = @_;
2655
2656 my (undef, undef, @other) = @{ $self->{children} };
2657 $self->remove ($_) for @other;
2417 2658
2418 $self->{par} = []; 2659 $self->{par} = [];
2419 $self->{height} = 0; 2660 $self->{height} = 0;
2420 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2661 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2421} 2662}
2422 2663
2423sub add_paragraph { 2664sub add_paragraph {
2424 my ($self, $color, $text, $indent) = @_; 2665 my ($self, $color, $para, $indent) = @_;
2425 2666
2426 for my $line (split /\n/, $text) { 2667 my ($text, @w) = ref $para ? @$para : $para;
2427 my ($w, $h) = $self->text_size ($line); 2668
2428 $self->{height} += $h; 2669 $para = {
2429 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2670 w => 1e10,
2671 wrapped => 1,
2672 fg => $color,
2673 indent => $indent,
2674 markup => $text,
2675 widget => \@w,
2430 } 2676 };
2431 2677
2432 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2678 $self->add (@w) if @w;
2679 push @{$self->{par}}, $para;
2680
2681 $self->{need_reflow}++;
2682 $self->update;
2683}
2684
2685sub scroll_to_bottom {
2686 my ($self) = @_;
2687
2688 $self->{scroll_to_bottom} = 1;
2689 $self->update;
2433} 2690}
2434 2691
2435sub update { 2692sub update {
2436 my ($self) = @_; 2693 my ($self) = @_;
2437 2694
… …
2439 2696
2440 return unless $self->{h} > 0; 2697 return unless $self->{h} > 0;
2441 2698
2442 delete $self->{texture}; 2699 delete $self->{texture};
2443 2700
2444 $ROOT->on_post_alloc ($self, sub { 2701 $ROOT->on_post_alloc ($self => sub {
2445 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2702 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2446 2703
2447 if (delete $self->{need_reflow}) { 2704 if (delete $self->{need_reflow}) {
2448 my $height = 0; 2705 my $height = 0;
2449 2706
2450 my $layout = $self->{layout};
2451
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453
2454 for (@{$self->{par}}) { 2707 for my $para (@{$self->{par}}) {
2455 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2708 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2456 $layout->set_width ($W - $_->[3]); 2709 my $layout = $self->get_layout ($para);
2457 $layout->set_markup ($_->[4]);
2458 my ($w, $h) = $layout->size; 2710 my ($w, $h) = $layout->size;
2459 $_->[0] = $w + $_->[3]; 2711
2460 $_->[1] = $h; 2712 $para->{w} = $w + $para->{indent};
2713 $para->{h} = $h;
2714 $para->{wrapped} = $layout->has_wrapped;
2461 } 2715 }
2462 2716
2463 $height += $_->[1]; 2717 $height += $para->{h};
2464 } 2718 }
2465 2719
2466 $self->{height} = $height; 2720 $self->{height} = $height;
2467 2721
2468 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2722 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2469 2723
2470 delete $self->{texture}; 2724 delete $self->{texture};
2471 } 2725 }
2472 2726
2727 if (delete $self->{scroll_to_bottom}) {
2728 $self->{children}[1]->set_value (1e10);
2729 }
2730
2473 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2731 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2474 glClearColor 0.5, 0.5, 0.5, 0; 2732 glClearColor 0, 0, 0, 0;
2475 glClear GL_COLOR_BUFFER_BIT; 2733 glClear GL_COLOR_BUFFER_BIT;
2476 2734
2477 my $top = int $self->{children}[1]{range}[0]; 2735 my $top = int $self->{children}[1]{range}[0];
2478 2736
2479 my $y0 = $top; 2737 my $y0 = $top;
2480 my $y1 = $top + $H; 2738 my $y1 = $top + $H;
2481 2739
2482 my $y = 0; 2740 my $y = 0;
2483
2484 my $layout = $self->{layout};
2485
2486 $layout->set_font ($self->{font}) if $self->{font};
2487 2741
2488 glEnable GL_BLEND; 2742 glEnable GL_BLEND;
2489 #TODO# not correct in windows where rgba is forced off 2743 #TODO# not correct in windows where rgba is forced off
2490 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2744 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2491 2745
2492 for my $par (@{$self->{par}}) { 2746 for my $para (@{$self->{par}}) {
2493 my $h = $par->[1]; 2747 my $h = $para->{h};
2494 2748
2495 if ($y0 < $y + $h && $y < $y1) { 2749 if ($y0 < $y + $h && $y < $y1) {
2496 $layout->set_foreground (@{ $par->[2] }); 2750
2497 $layout->set_width ($W - $par->[3]); 2751 my $layout = $self->get_layout ($para);
2498 $layout->set_markup ($par->[4]);
2499 2752
2500 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2753 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2501 2754
2502 glRasterPos $par->[3], $y - $y0; 2755 glRasterPos $para->{indent}, $y - $y0;
2503 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2756 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2757
2758 if (my @w = @{ $para->{widget} }) {
2759 my @s = $layout->get_shapes;
2760
2761 glDisable GL_BLEND;
2762 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, ();
2764
2765 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0;
2767
2768 $_->draw;
2769 }
2770 glEnable GL_BLEND;
2771 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2772 }
2504 } 2773 }
2505 2774
2506 $y += $h; 2775 $y += $h;
2507 } 2776 }
2508 2777
2509 glDisable GL_BLEND; 2778 glDisable GL_BLEND;
2510 }; 2779 };
2511 }); 2780 });
2512} 2781}
2513 2782
2783sub reconfigure {
2784 my ($self) = @_;
2785
2786 $self->SUPER::reconfigure;
2787
2788 $_->{w} = 1e10 for @{ $self->{par} };
2789 $self->reflow;
2790}
2791
2514sub _draw { 2792sub _draw {
2515 my ($self) = @_; 2793 my ($self) = @_;
2516 2794
2517 glEnable GL_TEXTURE_2D; 2795 glEnable GL_TEXTURE_2D;
2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2796 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2519 glColor 1, 1, 1, 1; 2797 glColor 0, 0, 0, 1;
2520 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2798 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2521 glDisable GL_TEXTURE_2D; 2799 glDisable GL_TEXTURE_2D;
2522 2800
2523 $self->{children}[1]->draw; 2801 $self->{children}[1]->draw;
2524
2525} 2802}
2526 2803
2527############################################################################# 2804#############################################################################
2528 2805
2529package CFClient::UI::Animator; 2806package CFClient::UI::Animator;
… …
2579 state => 0, 2856 state => 0,
2580 on_activate => \&toggle_flopper, 2857 on_activate => \&toggle_flopper,
2581 @_ 2858 @_
2582 ); 2859 );
2583 2860
2584 if ($self->{state}) {
2585 $self->{state} = 0;
2586 $self->toggle_flopper;
2587 }
2588
2589 $self 2861 $self
2590} 2862}
2591 2863
2592sub toggle_flopper { 2864sub toggle_flopper {
2593 my ($self) = @_; 2865 my ($self) = @_;
2594 2866
2595 # TODO: use animation 2867 $self->{other}->toggle_visibility;
2596 if ($self->{state} = !$self->{state}) {
2597 $CFClient::UI::ROOT->add ($self->{other});
2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2599 $self->_emit ("open");
2600 } else {
2601 $CFClient::UI::ROOT->remove ($self->{other});
2602 $self->_emit ("close");
2603 }
2604
2605 $self->_emit (changed => $self->{state});
2606} 2868}
2607 2869
2608############################################################################# 2870#############################################################################
2609 2871
2610package CFClient::UI::Tooltip; 2872package CFClient::UI::Tooltip;
… …
2623} 2885}
2624 2886
2625sub set_tooltip_from { 2887sub set_tooltip_from {
2626 my ($self, $widget) = @_; 2888 my ($self, $widget) = @_;
2627 2889
2890 my $tooltip = $widget->{tooltip};
2891
2892 if ($ENV{CFPLUS_DEBUG} & 2) {
2893 $tooltip .= "\n\n" . (ref $widget) . "\n"
2894 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2895 . "req $widget->{req_w} $widget->{req_h}\n"
2896 . "visible $widget->{visible}";
2897 }
2898
2899 $tooltip =~ s/^\n+//;
2900 $tooltip =~ s/\n+$//;
2901
2628 $self->add (new CFClient::UI::Label 2902 $self->add (new CFClient::UI::Label
2629 markup => $widget->{tooltip}, 2903 markup => $tooltip,
2630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2904 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631 fontsize => 0.8, 2905 fontsize => 0.8,
2632 fg => [0, 0, 0, 1], 2906 fg => [0, 0, 0, 1],
2633 ellipsise => 0, 2907 ellipsise => 0,
2634 font => ($widget->{tooltip_font} || $::FONT_PROP), 2908 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2641 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2915 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2642 2916
2643 ($w + 4, $h + 4) 2917 ($w + 4, $h + 4)
2644} 2918}
2645 2919
2646sub size_allocate { 2920sub invoke_size_allocate {
2647 my ($self, $w, $h) = @_; 2921 my ($self, $w, $h) = @_;
2648 2922
2649 $self->SUPER::size_allocate ($w - 4, $h - 4); 2923 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2924}
2925
2926sub invoke_visibility_change {
2927 my ($self, $visible) = @_;
2928
2929 return unless $visible;
2930
2931 $self->{root}->on_post_alloc ("move_$self" => sub {
2932 my $widget = $self->{owner}
2933 or return;
2934
2935 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2936
2937 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2938 if $x + $self->{w} > $self->{root}{w};
2939
2940 $self->move_abs ($x, $y);
2941 });
2650} 2942}
2651 2943
2652sub _draw { 2944sub _draw {
2653 my ($self) = @_; 2945 my ($self) = @_;
2654 2946
… …
2671 glVertex $w, $h; 2963 glVertex $w, $h;
2672 glVertex $w, 0; 2964 glVertex $w, 0;
2673 glEnd; 2965 glEnd;
2674 2966
2675 glTranslate 2 - 0.375, 2 - 0.375; 2967 glTranslate 2 - 0.375, 2 - 0.375;
2968
2676 $self->SUPER::_draw; 2969 $self->SUPER::_draw;
2677} 2970}
2678 2971
2679############################################################################# 2972#############################################################################
2680 2973
… …
2739 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3032 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2740 3033
2741 if ($tex) { 3034 if ($tex) {
2742 glEnable GL_TEXTURE_2D; 3035 glEnable GL_TEXTURE_2D;
2743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2744 glColor 1, 1, 1, 1; 3037 glColor 0, 0, 0, 1;
2745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3038 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2746 glDisable GL_TEXTURE_2D; 3039 glDisable GL_TEXTURE_2D;
2747 } 3040 }
2748} 3041}
2749 3042
2750sub DESTROY { 3043sub destroy {
2751 my ($self) = @_; 3044 my ($self) = @_;
2752 3045
2753 $self->{timer}->cancel 3046 $self->{timer}->cancel
2754 if $self->{timer}; 3047 if $self->{timer};
2755 3048
2756 $self->SUPER::DESTROY; 3049 $self->SUPER::destroy;
2757} 3050}
2758 3051
2759############################################################################# 3052#############################################################################
2760 3053
2761package CFClient::UI::Inventory; 3054package CFClient::UI::Buttonbar;
2762 3055
2763our @ISA = CFClient::UI::ScrolledWindow::; 3056our @ISA = CFClient::UI::HBox::;
2764 3057
2765sub new { 3058# TODO: should actualyl wrap buttons and other goodies.
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770 @_,
2771 );
2772
2773 $self
2774}
2775
2776sub set_items {
2777 my ($self, $items) = @_;
2778
2779 $self->{scrolled}->clear;
2780 return unless $items;
2781
2782 my @items = sort {
2783 ($a->{type} <=> $b->{type})
2784 or ($a->{name} cmp $b->{name})
2785 } @$items;
2786
2787 $self->{real_items} = \@items;
2788
2789 my $row = 0;
2790 for my $item (@items) {
2791 CFClient::Item::update_widgets $item;
2792
2793 $self->{scrolled}->add (0, $row, $item->{face_widget});
2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2795 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2796
2797 $row++;
2798 }
2799}
2800
2801sub size_request {
2802 my ($self) = @_;
2803 ($self->{req_w}, $self->{req_h});
2804}
2805 3059
2806############################################################################# 3060#############################################################################
2807 3061
2808package CFClient::UI::Menu; 3062package CFClient::UI::Menu;
2809 3063
… …
2821 ); 3075 );
2822 3076
2823 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3077 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2824 3078
2825 for my $item (@{ $self->{items} }) { 3079 for my $item (@{ $self->{items} }) {
2826 my ($widget, $cb) = @$item; 3080 my ($widget, $cb, $tooltip) = @$item;
2827 3081
2828 # handle various types of items, only text for now 3082 # handle various types of items, only text for now
2829 if (!ref $widget) { 3083 if (!ref $widget) {
2830 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
2831 can_hover => 1, 3085 can_hover => 1,
2832 can_events => 1, 3086 can_events => 1,
2833 text => $widget; 3087 markup => $widget,
3088 tooltip => $tooltip
2834 } 3089 }
2835 3090
2836 $self->{item}{$widget} = $item; 3091 $self->{item}{$widget} = $item;
2837 3092
2838 $self->{vbox}->add ($widget); 3093 $self->{vbox}->add ($widget);
… …
2843 3098
2844# popup given the event (must be a mouse button down event currently) 3099# popup given the event (must be a mouse button down event currently)
2845sub popup { 3100sub popup {
2846 my ($self, $ev) = @_; 3101 my ($self, $ev) = @_;
2847 3102
2848 $self->_emit ("popdown"); 3103 $self->emit ("popdown");
2849 3104
2850 # maybe save $GRAB? must be careful about events... 3105 # maybe save $GRAB? must be careful about events...
2851 $GRAB = $self; 3106 $GRAB = $self;
2852 $self->{button} = $ev->{button}; 3107 $self->{button} = $ev->{button};
2853 3108
2854 $self->show; 3109 $self->show;
2855 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3110 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2856} 3111}
2857 3112
2858sub mouse_motion { 3113sub invoke_mouse_motion {
2859 my ($self, $ev, $x, $y) = @_; 3114 my ($self, $ev, $x, $y) = @_;
2860 3115
2861 # TODO: should use vbox->find_widget or so 3116 # TODO: should use vbox->find_widget or so
2862 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3117 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2863 $self->{hover} = $self->{item}{$HOVER}; 3118 $self->{hover} = $self->{item}{$HOVER};
2864}
2865 3119
3120 0
3121}
3122
2866sub button_up { 3123sub invoke_button_up {
2867 my ($self, $ev, $x, $y) = @_; 3124 my ($self, $ev, $x, $y) = @_;
2868 3125
2869 if ($ev->{button} == $self->{button}) { 3126 if ($ev->{button} == $self->{button}) {
2870 undef $GRAB; 3127 undef $GRAB;
2871 $self->hide; 3128 $self->hide;
2872 3129
2873 $self->_emit ("popdown"); 3130 $self->emit ("popdown");
2874 $self->{hover}[1]->() if $self->{hover}; 3131 $self->{hover}[1]->() if $self->{hover};
3132 } else {
3133 return 0
3134 }
3135
2875 } 3136 1
2876} 3137}
2877 3138
2878############################################################################# 3139#############################################################################
2879 3140
2880package CFClient::UI::Statusbox; 3141package CFClient::UI::Multiplexer;
2881 3142
2882our @ISA = CFClient::UI::VBox::; 3143our @ISA = CFClient::UI::Container::;
2883 3144
2884sub new { 3145sub new {
2885 my $class = shift; 3146 my $class = shift;
2886 3147
2887 $class->SUPER::new ( 3148 my $self = $class->SUPER::new (
3149 @_,
3150 );
3151
3152 $self->{current} = $self->{children}[0]
3153 if @{ $self->{children} };
3154
3155 $self
3156}
3157
3158sub add {
3159 my ($self, @widgets) = @_;
3160
3161 $self->SUPER::add (@widgets);
3162
3163 $self->{current} = $self->{children}[0]
3164 if @{ $self->{children} };
3165}
3166
3167sub set_current_page {
3168 my ($self, $page_or_widget) = @_;
3169
3170 my $widget = ref $page_or_widget
3171 ? $page_or_widget
3172 : $self->{children}[$page_or_widget];
3173
3174 $self->{current} = $widget;
3175 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3176
3177 $self->emit (page_changed => $self->{current});
3178
3179 $self->realloc;
3180}
3181
3182sub visible_children {
3183 $_[0]{current}
3184}
3185
3186sub size_request {
3187 my ($self) = @_;
3188
3189 $self->{current}->size_request
3190}
3191
3192sub invoke_size_allocate {
3193 my ($self, $w, $h) = @_;
3194
3195 $self->{current}->configure (0, 0, $w, $h);
3196
3197 1
3198}
3199
3200sub _draw {
3201 my ($self) = @_;
3202
3203 $self->{current}->draw;
3204}
3205
3206#############################################################################
3207
3208package CFClient::UI::Notebook;
3209
3210our @ISA = CFClient::UI::VBox::;
3211
3212sub new {
3213 my $class = shift;
3214
3215 my $self = $class->SUPER::new (
3216 buttonbar => (new CFClient::UI::Buttonbar),
3217 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3218 # filter => # will be put between multiplexer and $self
3219 @_,
3220 );
3221
3222 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3223 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3224
3225 $self
3226}
3227
3228sub add {
3229 my ($self, $title, $widget, $tooltip) = @_;
3230
3231 Scalar::Util::weaken $self;
3232
3233 $self->{buttonbar}->add (new CFClient::UI::Button
3234 markup => $title,
3235 tooltip => $tooltip,
3236 on_activate => sub { $self->set_current_page ($widget) },
3237 );
3238
3239 $self->{multiplexer}->add ($widget);
3240}
3241
3242sub set_current_page {
3243 my ($self, $page) = @_;
3244
3245 $self->{multiplexer}->set_current_page ($page);
3246 $self->emit (page_changed => $self->{multiplexer}{current});
3247}
3248
3249#############################################################################
3250
3251package CFClient::UI::Combobox;
3252
3253use utf8;
3254
3255our @ISA = CFClient::UI::Button::;
3256
3257sub new {
3258 my $class = shift;
3259
3260 my $self = $class->SUPER::new (
3261 options => [], # [value, title, longdesc], ...
3262 value => undef,
3263 @_,
3264 );
3265
3266 $self->_set_value ($self->{value});
3267
3268 $self
3269}
3270
3271sub invoke_button_down {
3272 my ($self, $ev) = @_;
3273
3274 my @menu_items;
3275
3276 for (@{ $self->{options} }) {
3277 my ($value, $title, $tooltip) = @$_;
3278
3279 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3280 }
3281
3282 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3283}
3284
3285sub _set_value {
3286 my ($self, $value) = @_;
3287
3288 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3289 or return;
3290
3291 $self->{value} = $item->[0];
3292 $self->set_markup ("$item->[1] ⇓");
3293 $self->set_tooltip ($item->[2]);
3294}
3295
3296sub set_value {
3297 my ($self, $value) = @_;
3298
3299 return unless $self->{value} ne $value;
3300
3301 $self->_set_value ($value);
3302 $self->emit (changed => $value);
3303}
3304
3305#############################################################################
3306
3307package CFClient::UI::Statusbox;
3308
3309our @ISA = CFClient::UI::VBox::;
3310
3311sub new {
3312 my $class = shift;
3313
3314 my $self = $class->SUPER::new (
2888 fontsize => 0.8, 3315 fontsize => 0.8,
2889 @_, 3316 @_,
2890 ) 3317 );
3318
3319 Scalar::Util::weaken (my $this = $self);
3320
3321 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3322
3323 $self
2891} 3324}
2892 3325
2893sub reorder { 3326sub reorder {
2894 my ($self) = @_; 3327 my ($self) = @_;
2895 my $NOW = time; 3328 my $NOW = Time::HiRes::time;
3329
3330 # freeze display when hovering over any label
3331 return if $CFClient::UI::TOOLTIP->{owner}
3332 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3333 values %{ $self->{item} };
2896 3334
2897 while (my ($k, $v) = each %{ $self->{item} }) { 3335 while (my ($k, $v) = each %{ $self->{item} }) {
2898 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3336 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2899 } 3337 }
2900 3338
… …
2903 my @items = sort { 3341 my @items = sort {
2904 $a->{pri} <=> $b->{pri} 3342 $a->{pri} <=> $b->{pri}
2905 or $b->{id} <=> $a->{id} 3343 or $b->{id} <=> $a->{id}
2906 } values %{ $self->{item} }; 3344 } values %{ $self->{item} };
2907 3345
3346 $self->{timer}->interval (1);
3347
2908 my $count = 10 + 1; 3348 my $count = 10 + 1;
2909 for my $item (@items) { 3349 for my $item (@items) {
2910 last unless --$count; 3350 last unless --$count;
2911 3351
2912 push @widgets, $item->{label} ||= do { 3352 my $label = $item->{label} ||= do {
2913 # TODO: doesn't handle markup well (read as: at all) 3353 # TODO: doesn't handle markup well (read as: at all)
2914 my $short = $item->{count} > 1 3354 my $short = $item->{count} > 1
2915 ? "<b>$item->{count} ×</b> $item->{text}" 3355 ? "<b>$item->{count} ×</b> $item->{text}"
2916 : $item->{text}; 3356 : $item->{text};
2917 3357
… …
2925 tooltip => $item->{tooltip}, 3365 tooltip => $item->{tooltip},
2926 tooltip_font => $::FONT_PROP, 3366 tooltip_font => $::FONT_PROP,
2927 tooltip_width => 0.67, 3367 tooltip_width => 0.67,
2928 fontsize => $item->{fontsize} || $self->{fontsize}, 3368 fontsize => $item->{fontsize} || $self->{fontsize},
2929 max_w => $::WIDTH * 0.44, 3369 max_w => $::WIDTH * 0.44,
2930 fg => $item->{fg}, 3370 fg => [@{ $item->{fg} }],
2931 can_events => 1, 3371 can_events => 1,
2932 can_hover => 1 3372 can_hover => 1
2933 }; 3373 };
3374
3375 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3376 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3377 $label->update;
3378 $label->set_max_size (undef, $label->{req_h} * $diff)
3379 if $diff < 1;
3380 $self->{timer}->interval (1/30);
3381 } else {
3382 $label->{fg}[3] = $item->{fg}[3] || 1;
3383 }
3384
3385 push @widgets, $label;
2934 } 3386 }
2935 3387
2936 $self->clear; 3388 $self->clear;
2937 $self->SUPER::add (reverse @widgets); 3389 $self->SUPER::add (reverse @widgets);
2938} 3390}
… …
2943 $text =~ s/^\s+//; 3395 $text =~ s/^\s+//;
2944 $text =~ s/\s+$//; 3396 $text =~ s/\s+$//;
2945 3397
2946 return unless $text; 3398 return unless $text;
2947 3399
2948 my $timeout = time + ((delete $arg{timeout}) || 60); 3400 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2949 3401
2950 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3402 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2951 3403
2952 if (my $item = $self->{item}{$group}) { 3404 if (my $item = $self->{item}{$group}) {
2953 if ($item->{text} eq $text) { 3405 if ($item->{text} eq $text) {
2954 $item->{count}++; 3406 $item->{count}++;
2955 } else { 3407 } else {
2956 $item->{count} = 1; 3408 $item->{count} = 1;
2957 $item->{text} = $item->{tooltip} = $text; 3409 $item->{text} = $item->{tooltip} = $text;
2958 } 3410 }
2959 $item->{id} = ++$self->{id}; 3411 $item->{id} += 0.2;#d#
2960 $item->{timeout} = $timeout; 3412 $item->{timeout} = $timeout;
2961 delete $item->{label}; 3413 delete $item->{label};
2962 } else { 3414 } else {
2963 $self->{item}{$group} = { 3415 $self->{item}{$group} = {
2964 id => ++$self->{id}, 3416 id => ++$self->{id},
… …
2970 count => 1, 3422 count => 1,
2971 %arg, 3423 %arg,
2972 }; 3424 };
2973 } 3425 }
2974 3426
3427 $ROOT->on_refresh (reorder => sub {
2975 $self->reorder; 3428 $self->reorder;
3429 });
2976} 3430}
2977 3431
2978sub reconfigure { 3432sub reconfigure {
2979 my ($self) = @_; 3433 my ($self) = @_;
2980 3434
… …
2983 3437
2984 $self->reorder; 3438 $self->reorder;
2985 $self->SUPER::reconfigure; 3439 $self->SUPER::reconfigure;
2986} 3440}
2987 3441
3442sub destroy {
3443 my ($self) = @_;
3444
3445 $self->{timer}->cancel;
3446
3447 $self->SUPER::destroy;
3448}
3449
2988############################################################################# 3450#############################################################################
2989 3451
2990package CFClient::UI::Root; 3452package CFClient::UI::Inventory;
2991 3453
2992our @ISA = CFClient::UI::Container::; 3454our @ISA = CFClient::UI::Table::;
2993
2994use CFClient::OpenGL;
2995 3455
2996sub new { 3456sub new {
2997 my $class = shift; 3457 my $class = shift;
2998 3458
2999 $class->SUPER::new ( 3459 my $self = $class->SUPER::new (
3460 col_expand => [0, 1, 0],
3461 @_,
3462 );
3463
3464 $self
3465}
3466
3467sub set_items {
3468 my ($self, $items) = @_;
3469
3470 $self->clear;
3471 return unless $items;
3472
3473 my @items = sort {
3474 ($a->{type} <=> $b->{type})
3475 or ($a->{name} cmp $b->{name})
3476 } values %$items;
3477
3478 $self->{real_items} = \@items;
3479
3480 my $row = 0;
3481 for my $item (@items) {
3482 CFClient::Item::update_widgets $item;
3483
3484 $self->add (0, $row, $item->{face_widget});
3485 $self->add (1, $row, $item->{desc_widget});
3486 $self->add (2, $row, $item->{weight_widget});
3487
3488 $row++;
3489 }
3490}
3491
3492#############################################################################
3493
3494package CFClient::UI::SpellList;
3495
3496our @ISA = CFClient::UI::Table::;
3497
3498sub new {
3499 my $class = shift;
3500
3501 my $self = $class->SUPER::new (
3502 binding => [],
3503 commands => [],
3504 @_,
3505 )
3506}
3507
3508my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3509
3510my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3511 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3512my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3513 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3514my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3515 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3516my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3517 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3518my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3519 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3520
3521sub rebuild_spell_list {
3522 my ($self) = @_;
3523
3524 $CFClient::UI::ROOT->on_refresh ($self => sub {
3525 $self->clear;
3526
3527 return unless $::CONN;
3528
3529 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3530 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3531 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3532 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3533 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3534
3535 my $row = 0;
3536
3537 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3538 my $spell = $self->{spell}{$_};
3539
3540 $row++;
3541
3542 my $spell_cb = sub {
3543 my ($widget, $ev) = @_;
3544
3545 if ($ev->{button} == 1) {
3546 $::CONN->user_send ("cast $spell->{name}");
3547 } elsif ($ev->{button} == 2) {
3548 $::CONN->user_send ("invoke $spell->{name}");
3549 } elsif ($ev->{button} == 3) {
3550 (new CFClient::UI::Menu
3551 items => [
3552 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3553 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3554 ],
3555 )->popup ($ev);
3556 } else {
3557 return 0;
3558 }
3559
3560 1
3561 };
3562
3563 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3564
3565 #TODO: add path info to tooltip
3566 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3567
3568 $self->add (0, $row, new CFClient::UI::Face
3569 face => $spell->{face},
3570 can_hover => 1,
3571 can_events => 1,
3572 tooltip => $tooltip,
3573 on_button_down => $spell_cb,
3574 );
3575
3576 $self->add (1, $row, new CFClient::UI::Label
3577 expand => 1,
3578 text => $spell->{name},
3579 can_hover => 1,
3580 can_events => 1,
3581 tooltip => $tooltip,
3582 on_button_down => $spell_cb,
3583 );
3584
3585 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3586 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3587 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3588 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3589 }
3590 });
3591}
3592
3593sub add_spell {
3594 my ($self, $spell) = @_;
3595
3596 $self->{spell}->{$spell->{name}} = $spell;
3597 $self->rebuild_spell_list;
3598}
3599
3600sub remove_spell {
3601 my ($self, $spell) = @_;
3602
3603 delete $self->{spell}->{$spell->{name}};
3604 $self->rebuild_spell_list;
3605}
3606
3607sub clear_spells {
3608 my ($self) = @_;
3609
3610 $self->{spell} = {};
3611 $self->rebuild_spell_list;
3612}
3613
3614#############################################################################
3615
3616package CFClient::UI::Root;
3617
3618our @ISA = CFClient::UI::Container::;
3619
3620use List::Util qw(min max);
3621
3622use CFClient::OpenGL;
3623
3624sub new {
3625 my $class = shift;
3626
3627 my $self = $class->SUPER::new (
3000 visible => 1, 3628 visible => 1,
3001 @_, 3629 @_,
3002 ) 3630 );
3003}
3004 3631
3005sub configure { 3632 Scalar::Util::weaken ($self->{root} = $self);
3006 my ($self, $x, $y, $w, $h) = @_;
3007 3633
3008 $self->{w} = $w; 3634 $self
3009 $self->{h} = $h;
3010}
3011
3012sub check_size {
3013 my ($self) = @_;
3014
3015 $self->size_allocate ($self->{w}, $self->{h})
3016 if $self->{w};
3017} 3635}
3018 3636
3019sub size_request { 3637sub size_request {
3020 my ($self) = @_; 3638 my ($self) = @_;
3021 3639
3022 ($self->{w}, $self->{h}) 3640 ($self->{w}, $self->{h})
3023} 3641}
3024 3642
3643sub _to_pixel {
3644 my ($coord, $size, $max) = @_;
3645
3646 $coord =
3647 $coord eq "center" ? ($max - $size) * 0.5
3648 : $coord eq "max" ? $max
3649 : $coord;
3650
3651 $coord = 0 if $coord < 0;
3652 $coord = $max - $size if $coord > $max - $size;
3653
3654 int $coord + 0.5
3655}
3656
3025sub size_allocate { 3657sub invoke_size_allocate {
3026 my ($self, $w, $h) = @_; 3658 my ($self, $w, $h) = @_;
3027 3659
3028 for my $child ($self->children) { 3660 for my $child ($self->children) {
3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3661 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030 3662
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3663 $X = $child->{force_x} if exists $child->{force_x};
3032 if exists $child->{req_x}; 3664 $Y = $child->{force_y} if exists $child->{force_y};
3033 3665
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3666 $X = _to_pixel $X, $W, $self->{w};
3035 if exists $child->{req_y}; 3667 $Y = _to_pixel $Y, $H, $self->{h};
3036
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039 3668
3040 $child->configure ($X, $Y, $W, $H); 3669 $child->configure ($X, $Y, $W, $H);
3041 } 3670 }
3671
3672 1
3042} 3673}
3043 3674
3044sub coord2local { 3675sub coord2local {
3045 my ($self, $x, $y) = @_; 3676 my ($self, $x, $y) = @_;
3046 3677
… …
3054} 3685}
3055 3686
3056sub update { 3687sub update {
3057 my ($self) = @_; 3688 my ($self) = @_;
3058 3689
3059 $self->check_size;
3060 $::WANT_REFRESH++; 3690 $::WANT_REFRESH++;
3061} 3691}
3062 3692
3063sub add { 3693sub add {
3064 my ($self, @children) = @_; 3694 my ($self, @children) = @_;
3065 3695
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071
3072 for my $child (@children) {
3073 $child->{is_toplevel} = 1; 3696 $_->{is_toplevel} = 1
3074 3697 for @children;
3075 # integerise window positions
3076 $child->{x} = int $child->{x};
3077 $child->{y} = int $child->{y};
3078 }
3079 3698
3080 $self->SUPER::add (@children); 3699 $self->SUPER::add (@children);
3081} 3700}
3082 3701
3083sub remove { 3702sub remove {
3084 my ($self, @children) = @_; 3703 my ($self, @children) = @_;
3085 3704
3086 $self->SUPER::remove (@children); 3705 $self->SUPER::remove (@children);
3706
3707 delete $self->{is_toplevel}
3708 for @children;
3087 3709
3088 while (@children) { 3710 while (@children) {
3089 my $w = pop @children; 3711 my $w = pop @children;
3090 push @children, $w->children; 3712 push @children, $w->children;
3091 $w->set_invisible; 3713 $w->set_invisible;
… …
3110 while ($self->{refresh_hook}) { 3732 while ($self->{refresh_hook}) {
3111 $_->() 3733 $_->()
3112 for values %{delete $self->{refresh_hook}}; 3734 for values %{delete $self->{refresh_hook}};
3113 } 3735 }
3114 3736
3115 if ($self->{check_size}) { 3737 if ($self->{realloc}) {
3738 my %queue;
3116 my @queue; 3739 my @queue;
3740 my $widget;
3117 3741
3118 for (;;) { 3742 outer:
3119 if ($self->{check_size}) { 3743 while () {
3120 #TODO use array-of-depth approach 3744 if (my $realloc = delete $self->{realloc}) {
3745 for $widget (values %$realloc) {
3746 $widget->{visible} or next; # do not resize invisible widgets
3121 3747
3122 @queue = sort { $a->{visible} <=> $b->{visible} } 3748 $queue{$widget+0}++ and next; # duplicates are common
3123 @queue, values %{delete $self->{check_size}}; 3749
3750 push @{ $queue[$widget->{visible}] }, $widget;
3751 }
3124 } 3752 }
3125 3753
3754 while () {
3755 @queue or last outer;
3756
3126 my $widget = pop @queue || last; 3757 $widget = pop @{ $queue[-1] || [] }
3127 3758 and last;
3128 defined $widget->{visible} or last; # do not resize invisible widgets
3129
3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131 ? @$widget{qw(user_w user_h)}
3132 : $widget->size_request;
3133
3134 if (delete $widget->{force_alloc}
3135 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137 3759
3760 pop @queue;
3761 }
3762
3763 delete $queue{$widget+0};
3764
3765 my ($w, $h) = $widget->size_request;
3766
3767 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3768 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3769
3770 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3771 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3772
3773 $w = $widget->{force_w} if exists $widget->{force_w};
3774 $h = $widget->{force_h} if exists $widget->{force_h};
3775
3776 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3777 || delete $widget->{force_realloc}) {
3138 $widget->{req_w} = $w; 3778 $widget->{req_w} = $w;
3139 $widget->{req_h} = $h; 3779 $widget->{req_h} = $h;
3140 3780
3141 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3781 $self->{size_alloc}{$widget+0} = $widget;
3142 3782
3143 $widget->{parent}->check_size
3144 if $widget->{parent}; 3783 if (my $parent = $widget->{parent}) {
3784 $self->{realloc}{$parent+0} = $parent
3785 unless $queue{$parent+0};
3786
3787 $parent->{force_size_alloc} = 1;
3788 $self->{size_alloc}{$parent+0} = $parent;
3789 }
3145 } 3790 }
3791
3792 delete $self->{realloc}{$widget+0};
3146 } 3793 }
3147 } 3794 }
3148 3795
3149 while ($self->{size_alloc}) { 3796 while (my $size_alloc = delete $self->{size_alloc}) {
3150 for (values %{delete $self->{size_alloc}}) { 3797 my @queue = sort { $b->{visible} <=> $a->{visible} }
3151 my ($widget, $w, $h) = @$_; 3798 values %$size_alloc;
3799
3800 while () {
3801 my $widget = pop @queue || last;
3802
3803 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3152 3804
3153 $w = 0 if $w < 0; 3805 $w = 0 if $w < 0;
3154 $h = 0 if $h < 0; 3806 $h = 0 if $h < 0;
3155 3807
3808 $w = int $w + 0.5;
3809 $h = int $h + 0.5;
3810
3811 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3812 $widget->{old_w} = $widget->{w};
3813 $widget->{old_h} = $widget->{h};
3814
3156 $widget->{w} = $w; 3815 $widget->{w} = $w;
3157 $widget->{h} = $h; 3816 $widget->{h} = $h;
3817
3158 $widget->emit (size_allocate => $w, $h); 3818 $widget->emit (size_allocate => $w, $h);
3819 }
3159 } 3820 }
3160 } 3821 }
3161 3822
3162 while ($self->{post_alloc_hook}) { 3823 while ($self->{post_alloc_hook}) {
3163 $_->() 3824 $_->()
3164 for values %{delete $self->{post_alloc_hook}}; 3825 for values %{delete $self->{post_alloc_hook}};
3165 } 3826 }
3827
3166 3828
3167 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3829 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3168 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3830 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3169 glClear GL_COLOR_BUFFER_BIT; 3831 glClear GL_COLOR_BUFFER_BIT;
3170 3832
… …
3172 glLoadIdentity; 3834 glLoadIdentity;
3173 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3835 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3174 glMatrixMode GL_MODELVIEW; 3836 glMatrixMode GL_MODELVIEW;
3175 glLoadIdentity; 3837 glLoadIdentity;
3176 3838
3839 {
3840 package CFClient::UI::Base;
3841
3842 ($draw_x, $draw_y, $draw_w, $draw_h) =
3843 (0, 0, $self->{w}, $self->{h});
3844 }
3845
3177 $self->_draw; 3846 $self->_draw;
3178} 3847}
3179 3848
3180############################################################################# 3849#############################################################################
3181 3850

Diff Legend

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