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.245 by elmex, Sat May 27 21:15:57 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;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 218
210 for (keys %$self) { 219 for (keys %$self) {
211 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
213 } 222 }
214 } 223 }
215 224
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
223 } 235 }
224 236
225 $self 237 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
236} 238}
237 239
238sub destroy { 240sub destroy {
239 my ($self) = @_; 241 my ($self) = @_;
240 242
… …
242 %$self = (); 244 %$self = ();
243} 245}
244 246
245sub show { 247sub show {
246 my ($self) = @_; 248 my ($self) = @_;
249
247 return if $self->{parent}; 250 return if $self->{parent};
248 251
249 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
250} 253}
251 254
252sub show_centered { 255sub set_visible {
253 my ($self) = @_; 256 my ($self) = @_;
257
254 return if $self->{parent}; 258 return if $self->{visible};
255 259
256 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
257 262
258 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
259 "centered $self" => sub { 264
260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
261 }, 266
262 ); 267 $_->set_visible for $self->children;
263} 268}
264 269
265sub set_invisible { 270sub set_invisible {
266 my ($self) = @_; 271 my ($self) = @_;
267 272
268 return unless $self->{visible}; 273 return unless $self->{visible};
269 274
270 # broken show/hide model 275 $_->set_invisible for $self->children;
271 276
277 delete $self->{visible};
272 delete $self->{root}; 278 delete $self->{root};
273 delete $self->{visible};
274 279
275 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
276 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
277 282
278 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
279 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
280 285
281 $self->focus_out; 286 $self->focus_out;
282 287
283 $self->emit (visibility_change => 0); 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;
284} 306}
285 307
286sub hide { 308sub hide {
287 my ($self) = @_; 309 my ($self) = @_;
288 310
… …
290 312
291 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
292 if $self->{parent}; 314 if $self->{parent};
293} 315}
294 316
295sub move { 317sub move_abs {
296 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
297 319
298 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
299 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
300 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
301 323
302 $self->update; 324 $self->update;
303} 325}
304 326
305sub set_size { 327sub set_size {
306 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
307 329
308 $self->{user_w} = $w; 330 $self->{force_w} = $w;
309 $self->{user_h} = $h; 331 $self->{force_h} = $h;
310 332
311 $self->check_size; 333 $self->realloc;
312} 334}
313 335
314sub size_request { 336sub size_request {
315 require Carp; 337 require Carp;
316 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
318 340
319sub configure { 341sub configure {
320 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
321 343
322 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
323 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
324 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
325 349
326 # use alignment to adjust x, y 350 # use alignment to adjust x, y
327 351
328 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
329 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
330
331 ($w, $h) = ($w2, $h2);
332 } 354 }
333 355
334 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
335 $self->{x} = $x; 357 $self->{x} = $x;
336 $self->{y} = $y; 358 $self->{y} = $y;
337 $self->update; 359 $self->update;
338 } 360 }
339 361
340 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
341 $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;
342 } 369 }
343} 370}
344 371
345sub size_allocate { 372sub size_allocate {
346 # nothing to be done 373 # nothing to be done
347} 374}
348 375
349sub reconfigure {
350 my ($self) = @_;
351
352 $self->check_size (1);
353 $self->update;
354}
355
356sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
357} 382}
358 383
359sub set_max_size { 384sub set_max_size {
360 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
361 386
362 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
363 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
364} 391}
365 392
366sub set_tooltip { 393sub set_tooltip {
367 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
368 395
… …
373 400
374 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
375 402
376 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
377 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
378 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
379 } 406 }
380} 407}
381 408
382# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
383sub coord2local { 410sub coord2local {
… …
420 447
421 $::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
422 unless $FOCUS; 449 unless $FOCUS;
423} 450}
424 451
425sub mouse_motion { } 452sub mouse_motion { 0 }
426sub button_up { } 453sub button_up { 0 }
427sub key_down { } 454sub key_down { 0 }
428sub key_up { } 455sub key_up { 0 }
429 456
430sub button_down { 457sub button_down {
431 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
432 459
433 $self->focus_in; 460 $self->focus_in;
434}
435 461
436sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
437sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
438sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
439sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
440sub 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
441 538
442sub draw { 539sub draw {
443 my ($self) = @_; 540 my ($self) = @_;
444 541
445 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);
446 553
447 glPushMatrix; 554 glPushMatrix;
448 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
449 $self->_draw;
450 glPopMatrix;
451 556
452 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
453 my ($x, $y) = @$self{qw(x y)};
454
455 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
456 glEnable GL_BLEND; 559 glEnable GL_BLEND;
457 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
458 glBegin GL_QUADS; 561 glBegin GL_QUADS;
459 glVertex $x , $y; 562 glVertex 0 , 0;
460 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
461 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
462 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
463 glEnd; 566 glEnd;
464 glDisable GL_BLEND; 567 glDisable GL_BLEND;
465 } 568 }
466 569
467 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
468 glPushMatrix; 571 glPushMatrix;
469 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
471 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
472 glVertex 0 , 0; 575 glVertex 0 , 0;
473 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
474 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
475 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
476 glEnd; 579 glEnd;
477 glPopMatrix; 580 glPopMatrix;
478 #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;
479 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
480} 586}
481 587
482sub _draw { 588sub _draw {
483 my ($self) = @_; 589 my ($self) = @_;
484 590
485 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
486} 592}
487 593
488sub find_widget {
489 my ($self, $x, $y) = @_;
490
491 return () unless $self->{can_events};
492
493 return $self
494 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
495 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
496
497 ()
498}
499
500sub set_parent {
501 my ($self, $parent) = @_;
502
503 Scalar::Util::weaken ($self->{parent} = $parent);
504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
513 # TODO: req_w _does_change after ->reconfigure
514 $self->check_size
515 unless exists $self->{req_w};
516
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555}
556
557sub DESTROY { 594sub DESTROY {
558 my ($self) = @_; 595 my ($self) = @_;
559 596
560 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
561 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
562} 601}
563 602
564############################################################################# 603#############################################################################
565 604
566package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
591 630
592 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
593 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
594 633
595 glEnable GL_BLEND; 634 glEnable GL_BLEND;
596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
597 glColor @$color; 636 glColor_premultiply @$color;
598 637
599 glBegin GL_QUADS; 638 glBegin GL_QUADS;
600 glVertex 0 , 0; 639 glVertex 0 , 0;
601 glVertex 0 , $h; 640 glVertex 0 , $h;
602 glVertex $w, $h; 641 glVertex $w, $h;
… …
617 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
618 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
619} 658}
620 659
621sub size_request { 660sub size_request {
622 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
623} 664}
624 665
625sub draw { } 666sub draw { }
626 667
627############################################################################# 668#############################################################################
… …
631our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
632 673
633sub new { 674sub new {
634 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
635 676
636 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
637 678
638 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
639 children => [], 680 children => [],
640 can_events => 0, 681 can_events => 0,
641 %arg, 682 %arg,
642 ); 683 );
684
643 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
644 687
645 $self 688 $self
646} 689}
647 690
648sub add { 691sub add {
… …
656 $self->{children} = [ 699 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
659 ]; 702 ];
660 703
661 $self->check_size (1); 704 $self->realloc;
662 $self->update;
663} 705}
664 706
665sub children { 707sub children {
666 @{ $_[0]{children} } 708 @{ $_[0]{children} }
667} 709}
… …
672 delete $child->{parent}; 714 delete $child->{parent};
673 $child->hide; 715 $child->hide;
674 716
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 718
677 $self->check_size (1); 719 $self->realloc;
678 $self->update;
679} 720}
680 721
681sub clear { 722sub clear {
682 my ($self) = @_; 723 my ($self) = @_;
683 724
… …
687 for (@$children) { 728 for (@$children) {
688 delete $_->{parent}; 729 delete $_->{parent};
689 $_->hide; 730 $_->hide;
690 } 731 }
691 732
692 $self->check_size; 733 $self->realloc;
693 $self->update;
694} 734}
695 735
696sub find_widget { 736sub find_widget {
697 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
698 738
699 $x -= $self->{x}; 739 $x -= $self->{x};
700 $y -= $self->{y}; 740 $y -= $self->{y};
701 741
702 my $res; 742 my $res;
703 743
704 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
705 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
706 and return $res; 746 and return $res;
707 } 747 }
708 748
709 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
730} 770}
731 771
732sub add { 772sub add {
733 my ($self, $child) = @_; 773 my ($self, $child) = @_;
734 774
735 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
736
737 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
738} 777}
739 778
740sub remove { 779sub remove {
741 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
758 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
759} 798}
760 799
761############################################################################# 800#############################################################################
762 801
802# back-buffered drawing area
803
763package CFClient::UI::Window; 804package CFClient::UI::Window;
764 805
765our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
766 807
767use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
785 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
786 $self->update; 827 $self->update;
787} 828}
788 829
789sub _render { 830sub _render {
831 my ($self) = @_;
832
790 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
791} 834}
792 835
793sub render_child { 836sub render_child {
794 my ($self) = @_; 837 my ($self) = @_;
795 838
796 $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 {
797 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
799 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
800 $self->_render; 850 $self->_render;
801 }; 851 };
802} 852}
803 853
804sub _draw { 854sub _draw {
805 my ($self) = @_; 855 my ($self) = @_;
806 856
807 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
808 858
809 my $tex = $self->{texture} 859 my $tex = $self->{texture}
810 or return; 860 or return;
811 861
812 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
815 865
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 867
818 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
819} 869}
… …
835} 885}
836 886
837sub size_request { 887sub size_request {
838 my ($self) = @_; 888 my ($self) = @_;
839 889
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 891
842 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
843} 896}
844 897
845sub size_allocate { 898sub size_allocate {
846 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
847 900
901 my $child = $self->child;
902
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850 905
851 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
852 $self->update; 907 $self->update;
853} 908}
854 909
… …
890} 945}
891 946
892sub _render { 947sub _render {
893 my ($self) = @_; 948 my ($self) = @_;
894 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
895 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896 954
897 $self->SUPER::_render; 955 $self->SUPER::_render;
898} 956}
899 957
… …
902package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
903 961
904our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
905 963
906sub new { 964sub new {
907 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
908 968
909 my $self; 969 my $self;
910 970
911 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
912 vertical => 1, 972 vertical => 1,
… …
917 ; 977 ;
918 978
919 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
920 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
921 slider => $slider, 981 slider => $slider,
922 @_, 982 %arg,
923 ); 983 );
924 984
925 $self->{vp}->add ($self->{scrolled});
926 $self->add ($self->{vp});
927 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
928 987
929 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
930} 995}
931 996
932sub update { 997sub update {
933 my ($self) = @_; 998 my ($self) = @_;
934 999
… …
973 1038
974 if ($self->{bg}) { 1039 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
976 1041
977 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
979 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
980 1045
981 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
982 glVertex 0 , 0; 1047 glVertex 0 , 0;
983 glVertex 0 , $h; 1048 glVertex 0 , $h;
984 glVertex $w, $h; 1049 glVertex $w, $h;
… …
997 1062
998our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
999 1064
1000use CFClient::OpenGL; 1065use CFClient::OpenGL;
1001 1066
1002my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 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);
1005 1074
1006sub new { 1075sub new {
1007 my $class = shift; 1076 my ($class, %arg) = @_;
1008
1009 # TODO: user_x, user_y, overwrite moveto?
1010 1077
1011 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1081 border => 0.6,
1015 is_toplevel => 1,
1016 can_events => 1, 1082 can_events => 1,
1017 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1018 ); 1086 );
1019 1087
1020 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1021 align => 0, 1089 align => 0,
1022 valign => 1, 1090 valign => 1,
1023 text => $self->{title}, 1091 text => $self->{title},
1024 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1025 1094
1026 $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};
1027} 1103}
1028 1104
1029sub border { 1105sub border {
1030 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1031} 1107}
1032 1108
1033sub size_request { 1109sub size_request {
1034 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
1035 1114
1036 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1037 1116
1038 ( 1117 (
1039 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1042} 1121}
1043 1122
1044sub size_allocate { 1123sub size_allocate {
1045 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1046 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
1047 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1049 1136
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1051 if $self->{title};
1052
1053 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1054} 1138}
1055 1139
1056sub button_down { 1140sub button_down {
1057 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1058 1142
… …
1074 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1075 1159
1076 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1078 1162
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1165
1084 $self->check_size; 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 $self->realloc;
1085 }; 1168 };
1086 1169
1087 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1091 $self->{motion} = sub { 1174 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1093 1176
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1178
1096 $self->{user_x} = $bx + $x - $ox; 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy; 1180 # HACK: the next line is required to enforce placement
1098 $self->move ($self->{user_x}, $self->{user_y}); 1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1099 $self->update;
1100 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1101 } 1187 1
1102} 1188}
1103 1189
1104sub button_up { 1190sub button_up {
1105 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1106 1192
1107 delete $self->{motion}; 1193 !!delete $self->{motion}
1108} 1194}
1109 1195
1110sub mouse_motion { 1196sub mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1112 1198
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1114} 1202}
1115 1203
1116sub _draw { 1204sub _draw {
1117 my ($self) = @_; 1205 my ($self) = @_;
1118 1206
1207 my $child = $self->{children}[0];
1208
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1211
1122 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1214
1125 my $border = $self->border; 1215 my $border = $self->border;
1126 1216
1127 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1222
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1135 1225
1136 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1231 }
1147 1232
1148 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1149 1234
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1153} 1241}
1154 1242
1155############################################################################# 1243#############################################################################
1156 1244
1157package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1179 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1180 1268
1181 $child->set_parent ($self); 1269 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1183 1271
1184 $self->check_size (1); 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1185} 1279}
1186 1280
1187# 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?
1188sub clear { 1282sub clear {
1189 my ($self) = @_; 1283 my ($self) = @_;
… …
1194 for (@children) { 1288 for (@children) {
1195 delete $_->{parent}; 1289 delete $_->{parent};
1196 $_->hide; 1290 $_->hide;
1197 } 1291 }
1198 1292
1199 $self->check_size (1); 1293 $self->realloc;
1200 $self->update;
1201} 1294}
1202 1295
1203sub get_wh { 1296sub get_wh {
1204 my ($self) = @_; 1297 my ($self) = @_;
1205 1298
… …
1301 } 1394 }
1302} 1395}
1303 1396
1304############################################################################# 1397#############################################################################
1305 1398
1306package CFClient::UI::HBox; 1399package CFClient::UI::Box;
1307
1308# TODO: wrap into common Box base class
1309 1400
1310our @ISA = CFClient::UI::Container::; 1401our @ISA = CFClient::UI::Container::;
1311 1402
1312sub size_request { 1403sub size_request {
1313 my ($self) = @_; 1404 my ($self) = @_;
1314 1405
1315 my @alloc = map [$_->size_request], @{$self->{children}}; 1406 $self->{vertical}
1316 1407 ? (
1317 ( 1408 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1318 (List::Util::sum map $_->[0], @alloc), 1409 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1319 (List::Util::max map $_->[1], @alloc), 1410 )
1320 ) 1411 : (
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 )
1321} 1415}
1322 1416
1323sub size_allocate { 1417sub size_allocate {
1324 my ($self, $w, $h) = @_; 1418 my ($self, $w, $h) = @_;
1325 1419
1326 ($h, $w) = ($w, $h); 1420 my $space = $self->{vertical} ? $h : $w;
1327
1328 my $children = $self->{children}; 1421 my $children = $self->{children};
1329 1422
1330 my @h = map $_->{req_w}, @$children; 1423 my @req;
1331 1424
1332 my $req_h = List::Util::sum @h; 1425 if ($self->{homogeneous}) {
1333 1426 @req = ($space / (@$children || 1)) x @$children;
1334 if ($req_h > $h) {
1335 # ah well, not enough space
1336 $_ *= $h / $req_h for @h;
1337 } 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 {
1338 my $exp = List::Util::sum map $_->{expand}, @$children; 1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1339 $exp ||= 1;
1340 1436
1437 $space = ($space - $req) / $expand; # remaining space to give away
1438
1439 $req[$_] += $space * $children->[$_]{expand}
1341 for (0 .. $#$children) { 1440 for 0 .. $#$children;
1342 my $child = $children->[$_];
1343
1344 my $alloc_h = $h[$_];
1345 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1346 $h[$_] = $alloc_h;
1347 } 1441 }
1348 } 1442 }
1349 1443
1350 CFClient::UI::harmonize \@h; 1444 CFClient::UI::harmonize \@req;
1351 1445
1352 my $y = 0; 1446 my $pos = 0;
1353 for (0 .. $#$children) { 1447 for (0 .. $#$children) {
1354 my $child = $children->[$_];
1355 my $h = $h[$_]; 1448 my $alloc = $req[$_];
1356 $child->configure ($y, 0, $h, $w); 1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1357 1450
1358 $y += $h; 1451 $pos += $alloc;
1359 } 1452 }
1360 1453
1361 1 1454 1
1362} 1455}
1363 1456
1364############################################################################# 1457#############################################################################
1365 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
1366package CFClient::UI::VBox; 1474package CFClient::UI::VBox;
1367 1475
1368# TODO: wrap into common Box base class
1369
1370our @ISA = CFClient::UI::Container::; 1476our @ISA = CFClient::UI::Box::;
1371 1477
1372sub size_request { 1478sub new {
1373 my ($self) = @_; 1479 my $class = shift;
1374 1480
1375 my @alloc = map [$_->size_request], @{$self->{children}}; 1481 $class->SUPER::new (
1376 1482 vertical => 1,
1377 ( 1483 @_,
1378 (List::Util::max map $_->[0], @alloc),
1379 (List::Util::sum map $_->[1], @alloc),
1380 ) 1484 )
1381}
1382
1383sub size_allocate {
1384 my ($self, $w, $h) = @_;
1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1388 my $children = $self->{children};
1389
1390 my @h = map $_->{req_h}, @$children;
1391
1392 my $req_h = List::Util::sum @h;
1393
1394 if ($req_h > $h) {
1395 # ah well, not enough space
1396 $_ *= $h / $req_h for @h;
1397 } else {
1398 my $exp = List::Util::sum map $_->{expand}, @$children;
1399 $exp ||= 1;
1400
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403
1404 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1405 }
1406 }
1407
1408 CFClient::UI::harmonize \@h;
1409
1410 my $y = 0;
1411 for (0 .. $#$children) {
1412 my $child = $children->[$_];
1413 my $h = $h[$_];
1414 $child->configure (0, $y, $w, $h);
1415
1416 $y += $h;
1417 }
1418
1419 1
1420} 1485}
1421 1486
1422############################################################################# 1487#############################################################################
1423 1488
1424package CFClient::UI::Label; 1489package CFClient::UI::Label;
… …
1441 ellipsise => 3, # end 1506 ellipsise => 3, # end
1442 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1443 fontsize => 1, 1508 fontsize => 1,
1444 align => -1, 1509 align => -1,
1445 valign => -1, 1510 valign => -1,
1446 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1447 can_events => 0, 1513 can_events => 0,
1448 %arg 1514 %arg
1449 ); 1515 );
1450 1516
1451 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1478 1544
1479 delete $self->{texture}; 1545 delete $self->{texture};
1480 $self->SUPER::update; 1546 $self->SUPER::update;
1481} 1547}
1482 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1483sub set_text { 1556sub set_text {
1484 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1485 1558
1486 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1487 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1488 1561
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1491 1564
1565 delete $self->{size_req};
1566 $self->realloc;
1492 $self->update; 1567 $self->update;
1493 $self->check_size;
1494} 1568}
1495 1569
1496sub set_markup { 1570sub set_markup {
1497 my ($self, $markup) = @_; 1571 my ($self, $markup) = @_;
1498 1572
… …
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503 1577
1504 $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;
1505 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1506 1580
1581 delete $self->{size_req};
1582 $self->realloc;
1507 $self->update; 1583 $self->update;
1508 $self->check_size;
1509} 1584}
1510 1585
1511sub size_request { 1586sub size_request {
1512 my ($self) = @_; 1587 my ($self) = @_;
1513 1588
1589 $self->{size_req} ||= do {
1514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1515 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1516 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1517 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1518 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1519 1595
1520 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1521 1597
1522 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1523 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1524 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1525 1601
1526 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1527 1603
1528 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1529 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1530 } 1609 };
1531 1610
1532 ( 1611 @{ $self->{size_req} }
1533 $w + $self->{padding} * 2,
1534 $h + $self->{padding} * 2,
1535 )
1536} 1612}
1537 1613
1538sub size_allocate { 1614sub size_allocate {
1539 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1540 1616
1617 delete $self->{ox};
1618
1541 delete $self->{texture}; 1619 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1542} 1621}
1543 1622
1544sub set_fontsize { 1623sub set_fontsize {
1545 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1546 1625
1547 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1548 delete $self->{texture}; 1627 delete $self->{texture};
1549 1628
1550 $self->update; 1629 $self->realloc;
1551 $self->check_size; 1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1552} 1638}
1553 1639
1554sub _draw { 1640sub _draw {
1555 my ($self) = @_; 1641 my ($self) = @_;
1556 1642
… …
1562 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1563 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1564 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1565 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1652
1567 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1568 1655
1656 unless (exists $self->{ox}) {
1569 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1570 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1571 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1572 1660
1573 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1574 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1575 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1576
1577 $tex
1578 }; 1664 };
1579 1665
1580 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1581 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};
1582 1670
1583 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1584 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1585 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1586 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1587 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1588 } 1678 }
1589 1679
1590 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1591} 1681}
1592 1682
… …
1609 can_hover => 1, 1699 can_hover => 1,
1610 can_focus => 1, 1700 can_focus => 1,
1611 valign => 0, 1701 valign => 0,
1612 can_events => 1, 1702 can_events => 1,
1613 #text => ... 1703 #text => ...
1704 #hidden => "*",
1614 @_ 1705 @_
1615 ) 1706 )
1616} 1707}
1617 1708
1618sub _set_text { 1709sub _set_text {
… …
1620 1711
1621 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1622 1713
1623 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1624 1715
1625 delete $self->{texture};
1626
1627 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1628 $self->{text} = $text; 1717 $self->{text} = $text;
1629 1718
1630 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1631 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1632 1722
1633 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1634} 1727}
1635 1728
1636sub set_text { 1729sub set_text {
1637 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1638 1731
1639 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1640 $self->_set_text ($text); 1733 $self->_set_text ($text);
1641 $self->update;
1642 $self->check_size;
1643} 1734}
1644 1735
1645sub get_text { 1736sub get_text {
1646 $_[0]{text} 1737 $_[0]{text}
1647} 1738}
… …
1677 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1678 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1679 $self->_emit ('escape'); 1770 $self->_emit ('escape');
1680 } elsif ($uni) { 1771 } elsif ($uni) {
1681 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1682 } 1775 }
1683 1776
1684 $self->_set_text ($text); 1777 $self->_set_text ($text);
1685 $self->update; 1778
1686 $self->check_size; 1779 $self->realloc;
1780
1781 1
1687} 1782}
1688 1783
1689sub focus_in { 1784sub focus_in {
1690 my ($self) = @_; 1785 my ($self) = @_;
1691 1786
… …
1706 utf8::encode $text; 1801 utf8::encode $text;
1707 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1708 1803
1709 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1710 $self->update; 1805 $self->update;
1806
1807 1
1711} 1808}
1712 1809
1713sub mouse_motion { 1810sub mouse_motion {
1714 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1715# 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
1716} 1815}
1717 1816
1718sub _draw { 1817sub _draw {
1719 my ($self) = @_; 1818 my ($self) = @_;
1720 1819
1721 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1722 1821
1723 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1724 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1725 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1726 } else { 1825 } else {
1727 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1728 } 1827 }
1729 1828
1730 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1732 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1733 glVertex 0 , 0; 1832 glVertex 0 , 0;
1734 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1735 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1736 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1797 } else { 1896 } else {
1798 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1799 } 1898 }
1800 1899
1801 } else { 1900 } else {
1802 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1803 } 1904 1
1804
1805} 1905}
1806 1906
1807############################################################################# 1907#############################################################################
1808 1908
1809package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1818 1918
1819sub new { 1919sub new {
1820 my $class = shift; 1920 my $class = shift;
1821 1921
1822 $class->SUPER::new ( 1922 $class->SUPER::new (
1823 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1824 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1825 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1826 can_hover => 1, 1927 can_hover => 1,
1827 align => 0, 1928 align => 0,
1828 valign => 0, 1929 valign => 0,
… …
1837 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1838 1939
1839 $self->emit ("activate") 1940 $self->emit ("activate")
1840 if $x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1841 && $y >= 0 && $y < $self->{h}; 1942 && $y >= 0 && $y < $self->{h};
1943
1944 1
1842} 1945}
1843 1946
1844sub _draw { 1947sub _draw {
1845 my ($self) = @_; 1948 my ($self) = @_;
1846 1949
1847 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1848
1849 if ($GRAB == $self) {
1850 $self->{fg} = $self->{active_fg};
1851 }
1852 1951
1853 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1855 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1856 1955
… …
1875 1974
1876sub new { 1975sub new {
1877 my $class = shift; 1976 my $class = shift;
1878 1977
1879 $class->SUPER::new ( 1978 $class->SUPER::new (
1880 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1881 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1882 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1883 bg => [0, 0, 0, 0.2], 1983 bg => [0, 0, 0, 0.2],
1884 active_bg => [1, 1, 1, 0.5], 1984 active_bg => [1, 1, 1, 0.5],
1885 state => 0, 1985 state => 0,
… …
1889} 1989}
1890 1990
1891sub size_request { 1991sub size_request {
1892 my ($self) = @_; 1992 my ($self) = @_;
1893 1993
1894 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1895} 1995}
1896 1996
1897sub button_down { 1997sub button_down {
1898 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1899 1999
1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1902 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1903 $self->_emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1904 } 2008 1
1905} 2009}
1906 2010
1907sub _draw { 2011sub _draw {
1908 my ($self) = @_; 2012 my ($self) = @_;
1909 2013
1910 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1911 2015
1912 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1913 2017
1914 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;
1915 2021
1916 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1917 2023
1918 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1919 2025
… …
2074 2180
2075 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
2076 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
2077 2183
2078 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
2079 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;
2080 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
2081 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2082 2189
2083 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2084 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2184 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
2185 active_fg => [0, 0, 0], 2292 active_fg => [0, 0, 0],
2186 bg => [0, 0, 0, 0.2], 2293 bg => [0, 0, 0, 0.2],
2187 active_bg => [1, 1, 1, 0.5], 2294 active_bg => [1, 1, 1, 0.5],
2188 range => [0, 0, 100, 10, 0], 2295 range => [0, 0, 100, 10, 0],
2189 req_w => $::WIDTH / 80, 2296 min_w => $::WIDTH / 80,
2190 req_h => $::WIDTH / 80, 2297 min_h => $::WIDTH / 80,
2191 vertical => 0, 2298 vertical => 0,
2192 can_hover => 1, 2299 can_hover => 1,
2193 inner_pad => 0.02, 2300 inner_pad => 0.02,
2194 @_ 2301 @_
2195 ); 2302 );
… …
2198 $self->update; 2305 $self->update;
2199 2306
2200 $self 2307 $self
2201} 2308}
2202 2309
2310sub changed { }
2311
2203sub set_range { 2312sub set_range {
2204 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2205 2314
2206 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2207 2316
2208 $self->update
2209 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2210} 2321}
2211 2322
2212sub set_value { 2323sub set_value {
2213 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2214 2325
… …
2233} 2344}
2234 2345
2235sub size_request { 2346sub size_request {
2236 my ($self) = @_; 2347 my ($self) = @_;
2237 2348
2238 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
2239 my $h = $self->{req_h};
2240
2241 $self->{vertical} ? ($h, $w) : ($w, $h)
2242} 2350}
2243 2351
2244sub button_down { 2352sub button_down {
2245 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2246 2354
2247 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2248 2356
2249 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250 2358
2251 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2252} 2360}
2253 2361
2254sub mouse_motion { 2362sub mouse_motion {
2255 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2256 2364
… …
2260 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2261 2369
2262 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2263 2371
2264 $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
2265 } 2377 1
2266} 2378}
2267 2379
2268sub update { 2380sub update {
2269 my ($self) = @_; 2381 my ($self) = @_;
2270 2382
2271 $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}) {
2272 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2273 2392
2274 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2276 2395
… …
2282 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2283 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2284 2403
2285 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2286 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2287 }); 2406 }
2288
2289 $self->SUPER::update;
2290}
2291
2292sub _draw {
2293 my ($self) = @_;
2294 2407
2295 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2296 2409
2297 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2298 2411
… …
2359sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2360sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2361 2474
2362############################################################################# 2475#############################################################################
2363 2476
2364package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2365 2478
2366our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2367 2480
2368use CFClient::OpenGL; 2481use CFClient::OpenGL;
2369 2482
… …
2371 my $class = shift; 2484 my $class = shift;
2372 2485
2373 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2374 fontsize => 1, 2487 fontsize => 1,
2375 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2376 #font => default_font 2490 #font => default_font
2377 @_, 2491 @_,
2378 2492
2379 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2380 par => [], 2494 par => [],
… …
2403 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2404 2518
2405 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2406 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $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});
2408 2523
2409 $self->reflow; 2524 $self->reflow;
2410} 2525}
2411 2526
2412sub text_size { 2527sub text_size {
… …
2414 2529
2415 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2416 2531
2417 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2418 $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});
2419 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2420 2536
2421 $layout->size 2537 $layout->size
2422} 2538}
2423 2539
… …
2462 2578
2463 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2464 2580
2465 delete $self->{texture}; 2581 delete $self->{texture};
2466 2582
2467 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2468 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2469 2585
2470 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2471 my $height = 0; 2587 my $height = 0;
2472 2588
… …
2475 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2476 2592
2477 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2478 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2479 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2480 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2481 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2482 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2483 $_->[1] = $h; 2600 $_->[1] = $h;
2484 } 2601 }
… …
2487 } 2604 }
2488 2605
2489 $self->{height} = $height; 2606 $self->{height} = $height;
2490 2607
2491 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2492 2609
2493 delete $self->{texture}; 2610 delete $self->{texture};
2494 } 2611 }
2495 2612
2496 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2497 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2498 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2499 2616
2500 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2501 2618
2502 my $y0 = $top; 2619 my $y0 = $top;
… …
2516 my $h = $par->[1]; 2633 my $h = $par->[1];
2517 2634
2518 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2519 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2520 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2521 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2522 2640
2523 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2524 2642
2525 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2537sub _draw { 2655sub _draw {
2538 my ($self) = @_; 2656 my ($self) = @_;
2539 2657
2540 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2542 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2543 $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});
2544 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2545 2663
2546 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2547 2665
2548} 2666}
… …
2631} 2749}
2632 2750
2633sub set_tooltip_from { 2751sub set_tooltip_from {
2634 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2635 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
2636 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2637 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2638 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639 fontsize => 0.8, 2769 fontsize => 0.8,
2640 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2641 ellipsise => 0, 2771 ellipsise => 0,
2642 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2653 2783
2654sub size_allocate { 2784sub size_allocate {
2655 my ($self, $w, $h) = @_; 2785 my ($self, $w, $h) = @_;
2656 2786
2657 $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 });
2658} 2806}
2659 2807
2660sub _draw { 2808sub _draw {
2661 my ($self) = @_; 2809 my ($self) = @_;
2662 2810
… …
2679 glVertex $w, $h; 2827 glVertex $w, $h;
2680 glVertex $w, 0; 2828 glVertex $w, 0;
2681 glEnd; 2829 glEnd;
2682 2830
2683 glTranslate 2 - 0.375, 2 - 0.375; 2831 glTranslate 2 - 0.375, 2 - 0.375;
2832
2684 $self->SUPER::_draw; 2833 $self->SUPER::_draw;
2685} 2834}
2686 2835
2687############################################################################# 2836#############################################################################
2688 2837
… …
2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748 2897
2749 if ($tex) { 2898 if ($tex) {
2750 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2755 } 2904 }
2756} 2905}
2757 2906
2758sub DESTROY { 2907sub destroy {
2759 my ($self) = @_; 2908 my ($self) = @_;
2760 2909
2761 $self->{timer}->cancel 2910 $self->{timer}->cancel
2762 if $self->{timer}; 2911 if $self->{timer};
2763 2912
2764 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2765} 2914}
2766 2915
2767############################################################################# 2916#############################################################################
2768 2917
2769package CFClient::UI::Inventory; 2918package CFClient::UI::Buttonbar;
2770 2919
2771our @ISA = CFClient::UI::ScrolledWindow::; 2920our @ISA = CFClient::UI::HBox::;
2772 2921
2773sub new { 2922# TODO: should actualyl wrap buttons and other goodies.
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808
2809sub size_request {
2810 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h});
2812}
2813 2923
2814############################################################################# 2924#############################################################################
2815 2925
2816package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2817 2927
… …
2829 ); 2939 );
2830 2940
2831 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2832 2942
2833 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2834 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2835 2945
2836 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2837 if (!ref $widget) { 2947 if (!ref $widget) {
2838 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2839 can_hover => 1, 2949 can_hover => 1,
2840 can_events => 1, 2950 can_events => 1,
2841 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2842 } 2953 }
2843 2954
2844 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2845 2956
2846 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2858 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 2970 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2861 2972
2862 $self->show; 2973 $self->show;
2863 $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);
2864} 2975}
2865 2976
2866sub mouse_motion { 2977sub mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2868 2979
2869 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2872} 2985}
2873 2986
2874sub button_up { 2987sub button_up {
2875 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2876 2989
… …
2878 undef $GRAB; 2991 undef $GRAB;
2879 $self->hide; 2992 $self->hide;
2880 2993
2881 $self->_emit ("popdown"); 2994 $self->_emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2883 } 3000 1
2884} 3001}
2885 3002
2886############################################################################# 3003#############################################################################
2887 3004
2888package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2889 3006
2890our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2891 3008
2892sub new { 3009sub new {
2893 my $class = shift; 3010 my $class = shift;
2894 3011
2895 $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 (
2896 fontsize => 0.8, 3177 fontsize => 0.8,
2897 @_, 3178 @_,
2898 ) 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
2899} 3186}
2900 3187
2901sub reorder { 3188sub reorder {
2902 my ($self) = @_; 3189 my ($self) = @_;
2903 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} };
2904 3196
2905 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 } 3199 }
2908 3200
… …
2911 my @items = sort { 3203 my @items = sort {
2912 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2915 3207
3208 $self->{timer}->interval (1);
3209
2916 my $count = 10 + 1; 3210 my $count = 10 + 1;
2917 for my $item (@items) { 3211 for my $item (@items) {
2918 last unless --$count; 3212 last unless --$count;
2919 3213
2920 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text}; 3218 : $item->{text};
2925 3219
… …
2933 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2939 can_events => 1, 3233 can_events => 1,
2940 can_hover => 1 3234 can_hover => 1
2941 }; 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;
2942 } 3248 }
2943 3249
2944 $self->clear; 3250 $self->clear;
2945 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2946} 3252}
… …
2951 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2953 3259
2954 return unless $text; 3260 return unless $text;
2955 3261
2956 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2957 3263
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959 3265
2960 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2962 $item->{count}++; 3268 $item->{count}++;
2963 } else { 3269 } else {
2964 $item->{count} = 1; 3270 $item->{count} = 1;
2965 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2966 } 3272 }
2967 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2968 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2969 delete $item->{label}; 3275 delete $item->{label};
2970 } else { 3276 } else {
2971 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2972 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
2991 3297
2992 $self->reorder; 3298 $self->reorder;
2993 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
2994} 3300}
2995 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
2996############################################################################# 3310#############################################################################
2997 3311
2998package CFClient::UI::Root; 3312package CFClient::UI::Inventory;
2999 3313
3000our @ISA = CFClient::UI::Container::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
3001
3002use CFClient::OpenGL;
3003 3315
3004sub new { 3316sub new {
3005 my $class = shift; 3317 my $class = shift;
3006 3318
3007 $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 (
3008 visible => 1, 3685 visible => 1,
3009 @_, 3686 @_,
3010 ) 3687 );
3011}
3012 3688
3013sub configure { 3689 Scalar::Util::weaken ($self->{root} = $self);
3014 my ($self, $x, $y, $w, $h) = @_;
3015 3690
3016 $self->{w} = $w; 3691 $self
3017 $self->{h} = $h;
3018}
3019
3020sub check_size {
3021 my ($self) = @_;
3022
3023 $self->size_allocate ($self->{w}, $self->{h})
3024 if $self->{w};
3025} 3692}
3026 3693
3027sub size_request { 3694sub size_request {
3028 my ($self) = @_; 3695 my ($self) = @_;
3029 3696
3030 ($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
3031} 3712}
3032 3713
3033sub size_allocate { 3714sub size_allocate {
3034 my ($self, $w, $h) = @_; 3715 my ($self, $w, $h) = @_;
3035 3716
3036 for my $child ($self->children) { 3717 for my $child ($self->children) {
3037 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)};
3038 3719
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3720 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3721 $Y = $child->{force_y} if exists $child->{force_y};
3041 3722
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3723 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3724 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3725
3051 $child->configure ($X, $Y, $W, $H); 3726 $child->configure ($X, $Y, $W, $H);
3052 } 3727 }
3053} 3728}
3054 3729
… …
3065} 3740}
3066 3741
3067sub update { 3742sub update {
3068 my ($self) = @_; 3743 my ($self) = @_;
3069 3744
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3745 $::WANT_REFRESH++;
3072} 3746}
3073 3747
3074sub add { 3748sub add {
3075 my ($self, @children) = @_; 3749 my ($self, @children) = @_;
3076 3750
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082
3083 for my $child (@children) {
3084 $child->{is_toplevel} = 1; 3751 $_->{is_toplevel} = 1
3085 3752 for @children;
3086 # integerise window positions
3087 $child->{x} = int $child->{x};
3088 $child->{y} = int $child->{y};
3089 }
3090 3753
3091 $self->SUPER::add (@children); 3754 $self->SUPER::add (@children);
3092} 3755}
3093 3756
3094sub remove { 3757sub remove {
3095 my ($self, @children) = @_; 3758 my ($self, @children) = @_;
3096 3759
3097 $self->SUPER::remove (@children); 3760 $self->SUPER::remove (@children);
3761
3762 delete $self->{is_toplevel}
3763 for @children;
3098 3764
3099 while (@children) { 3765 while (@children) {
3100 my $w = pop @children; 3766 my $w = pop @children;
3101 push @children, $w->children; 3767 push @children, $w->children;
3102 $w->set_invisible; 3768 $w->set_invisible;
… …
3121 while ($self->{refresh_hook}) { 3787 while ($self->{refresh_hook}) {
3122 $_->() 3788 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
3124 } 3790 }
3125 3791
3126 if ($self->{check_size}) { 3792 if ($self->{realloc}) {
3793 my %queue;
3127 my @queue; 3794 my @queue;
3795 my $widget;
3128 3796
3129 for (;;) { 3797 outer:
3130 if ($self->{check_size}) { 3798 while () {
3131 #TODO use array-of-depth approach 3799 if (my $realloc = delete $self->{realloc}) {
3800 for $widget (values %$realloc) {
3801 $widget->{visible} or next; # do not resize invisible widgets
3132 3802
3133 @queue = sort { $a->{visible} <=> $b->{visible} } 3803 $queue{$widget+0}++ and next; # duplicates are common
3134 @queue, values %{delete $self->{check_size}}; 3804
3805 push @{ $queue[$widget->{visible}] }, $widget;
3806 }
3135 } 3807 }
3136 3808
3809 while () {
3810 @queue or last outer;
3811
3137 my $widget = pop @queue || last; 3812 $widget = pop @{ $queue[-1] || [] }
3138 3813 and last;
3139 defined $widget->{visible} or last; # do not resize invisible widgets
3140
3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3142 ? @$widget{qw(user_w user_h)}
3143 : $widget->size_request;
3144
3145 if (delete $widget->{force_alloc}
3146 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3148 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}) {
3149 $widget->{req_w} = $w; 3833 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h; 3834 $widget->{req_h} = $h;
3151 3835
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3836 $self->{size_alloc}{$widget+0} = $widget;
3153 3837
3154 $widget->{parent}->check_size
3155 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 }
3156 } 3845 }
3846
3847 delete $self->{realloc}{$widget+0};
3157 } 3848 }
3158 } 3849 }
3159 3850
3160 while ($self->{size_alloc}) { 3851 while (my $size_alloc = delete $self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) { 3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
3162 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)};
3163 3859
3164 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
3166 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
3167 $widget->{w} = $w; 3870 $widget->{w} = $w;
3168 $widget->{h} = $h; 3871 $widget->{h} = $h;
3872
3169 $widget->emit (size_allocate => $w, $h); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
3170 } 3875 }
3171 } 3876 }
3172 3877
3173 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
3174 $_->() 3879 $_->()
3175 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
3176 } 3881 }
3882
3177 3883
3178 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3180 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
3181 3887
… …
3183 glLoadIdentity; 3889 glLoadIdentity;
3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3185 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3186 glLoadIdentity; 3892 glLoadIdentity;
3187 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
3188 $self->_draw; 3901 $self->_draw;
3189} 3902}
3190 3903
3191############################################################################# 3904#############################################################################
3192 3905

Diff Legend

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