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.242 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC

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

Diff Legend

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