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.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.323 by root, Wed Jul 5 03:01:01 2006 UTC

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

Diff Legend

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