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

Diff Legend

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