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.304 by elmex, Tue Jun 13 11:01:04 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};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
1025 1103
1026 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1027} 1113}
1028 1114
1029sub border { 1115sub border {
1030 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1031} 1117}
1032 1118
1033sub size_request { 1119sub size_request {
1034 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
1035 1127
1036 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1037 1129
1038 ( 1130 (
1039 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
1042} 1134}
1043 1135
1044sub size_allocate { 1136sub size_allocate {
1045 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1046 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
1047 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1049 1149
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); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
1054} 1154}
1055 1155
1056sub button_down { 1156sub button_down {
1057 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1058 1158
… …
1074 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1075 1175
1076 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1078 1178
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1181
1084 $self->check_size; 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1183 $self->realloc;
1085 }; 1184 };
1086 1185
1087 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1091 $self->{motion} = sub { 1190 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1093 1192
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1194
1096 $self->{user_x} = $bx + $x - $ox; 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy; 1196 # HACK: the next line is required to enforce placement
1098 $self->move ($self->{user_x}, $self->{user_y}); 1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1099 $self->update;
1100 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1101 } 1203 1
1102} 1204}
1103 1205
1104sub button_up { 1206sub button_up {
1105 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1106 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1107 delete $self->{motion}; 1212 !!delete $self->{motion}
1108} 1213}
1109 1214
1110sub mouse_motion { 1215sub mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
1112 1217
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
1114} 1221}
1115 1222
1116sub _draw { 1223sub _draw {
1117 my ($self) = @_; 1224 my ($self) = @_;
1118 1225
1226 my $child = $self->{children}[0];
1227
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1230
1122 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1233
1125 my $border = $self->border; 1234 my $border = $self->border;
1126 1235
1127 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1241
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
1135 1244
1136 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1248 $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); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1250 }
1147 1251
1148 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1149 1253
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1254 $child->draw;
1255
1256 if ($self->{title_widget}) {
1257 glTranslate 0, $border - $self->{h};
1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1153} 1265}
1154 1266
1155############################################################################# 1267#############################################################################
1156 1268
1157package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1179 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1180 1292
1181 $child->set_parent ($self); 1293 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1183 1295
1184 $self->check_size (1); 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1185} 1303}
1186 1304
1187# TODO: move to container class maybe? send children a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1306sub clear {
1189 my ($self) = @_; 1307 my ($self) = @_;
… …
1194 for (@children) { 1312 for (@children) {
1195 delete $_->{parent}; 1313 delete $_->{parent};
1196 $_->hide; 1314 $_->hide;
1197 } 1315 }
1198 1316
1199 $self->check_size (1); 1317 $self->realloc;
1200 $self->update;
1201} 1318}
1202 1319
1203sub get_wh { 1320sub get_wh {
1204 my ($self) = @_; 1321 my ($self) = @_;
1205 1322
… …
1301 } 1418 }
1302} 1419}
1303 1420
1304############################################################################# 1421#############################################################################
1305 1422
1306package CFClient::UI::HBox; 1423package CFClient::UI::Box;
1307
1308# TODO: wrap into common Box base class
1309 1424
1310our @ISA = CFClient::UI::Container::; 1425our @ISA = CFClient::UI::Container::;
1311 1426
1312sub size_request { 1427sub size_request {
1313 my ($self) = @_; 1428 my ($self) = @_;
1314 1429
1315 my @alloc = map [$_->size_request], @{$self->{children}}; 1430 $self->{vertical}
1316 1431 ? (
1317 ( 1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1318 (List::Util::sum map $_->[0], @alloc), 1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1319 (List::Util::max map $_->[1], @alloc), 1434 )
1320 ) 1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1321} 1439}
1322 1440
1323sub size_allocate { 1441sub size_allocate {
1324 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1325 1443
1326 ($h, $w) = ($w, $h); 1444 my $space = $self->{vertical} ? $h : $w;
1327
1328 my $children = $self->{children}; 1445 my $children = $self->{children};
1329 1446
1330 my @h = map $_->{req_w}, @$children; 1447 my @req;
1331 1448
1332 my $req_h = List::Util::sum @h; 1449 if ($self->{homogeneous}) {
1333 1450 @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 { 1451 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1453 my $req = List::Util::sum @req;
1454
1455 if ($req > $space) {
1456 # ah well, not enough space
1457 $_ *= $space / $req for @req;
1458 } else {
1338 my $exp = List::Util::sum map $_->{expand}, @$children; 1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1339 $exp ||= 1;
1340 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children->[$_]{expand}
1341 for (0 .. $#$children) { 1464 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 } 1465 }
1348 } 1466 }
1349 1467
1350 CFClient::UI::harmonize \@h; 1468 CFClient::UI::harmonize \@req;
1351 1469
1352 my $y = 0; 1470 my $pos = 0;
1353 for (0 .. $#$children) { 1471 for (0 .. $#$children) {
1354 my $child = $children->[$_];
1355 my $h = $h[$_]; 1472 my $alloc = $req[$_];
1356 $child->configure ($y, 0, $h, $w); 1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1357 1474
1358 $y += $h; 1475 $pos += $alloc;
1359 } 1476 }
1360 1477
1361 1 1478 1
1362} 1479}
1363 1480
1364############################################################################# 1481#############################################################################
1365 1482
1483package CFClient::UI::HBox;
1484
1485our @ISA = CFClient::UI::Box::;
1486
1487sub new {
1488 my $class = shift;
1489
1490 $class->SUPER::new (
1491 vertical => 0,
1492 @_,
1493 )
1494}
1495
1496#############################################################################
1497
1366package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1367 1499
1368# TODO: wrap into common Box base class
1369
1370our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1371 1501
1372sub size_request { 1502sub new {
1373 my ($self) = @_; 1503 my $class = shift;
1374 1504
1375 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1376 1506 vertical => 1,
1377 ( 1507 @_,
1378 (List::Util::max map $_->[0], @alloc),
1379 (List::Util::sum map $_->[1], @alloc),
1380 ) 1508 )
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} 1509}
1421 1510
1422############################################################################# 1511#############################################################################
1423 1512
1424package CFClient::UI::Label; 1513package CFClient::UI::Label;
… …
1441 ellipsise => 3, # end 1530 ellipsise => 3, # end
1442 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1443 fontsize => 1, 1532 fontsize => 1,
1444 align => -1, 1533 align => -1,
1445 valign => -1, 1534 valign => -1,
1446 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1447 can_events => 0, 1537 can_events => 0,
1448 %arg 1538 %arg
1449 ); 1539 );
1450 1540
1451 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1478 1568
1479 delete $self->{texture}; 1569 delete $self->{texture};
1480 $self->SUPER::update; 1570 $self->SUPER::update;
1481} 1571}
1482 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1483sub set_text { 1580sub set_text {
1484 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1485 1582
1486 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1487 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1488 1585
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1491 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1492 $self->update; 1591 $self->update;
1493 $self->check_size;
1494} 1592}
1495 1593
1496sub set_markup { 1594sub set_markup {
1497 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1498 1596
… …
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503 1601
1504 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1505 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1506 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1507 $self->update; 1607 $self->update;
1508 $self->check_size;
1509} 1608}
1510 1609
1511sub size_request { 1610sub size_request {
1512 my ($self) = @_; 1611 my ($self) = @_;
1513 1612
1613 $self->{size_req} ||= do {
1514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1515 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1516 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1517 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1518 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1519 1619
1520 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1521 1621
1522 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1523 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1524 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1525 1625
1526 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1527 1627
1528 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1529 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1530 } 1633 };
1531 1634
1532 ( 1635 @{ $self->{size_req} }
1533 $w + $self->{padding} * 2,
1534 $h + $self->{padding} * 2,
1535 )
1536} 1636}
1537 1637
1538sub size_allocate { 1638sub size_allocate {
1539 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1540 1640
1641 delete $self->{ox};
1642
1541 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1542} 1645}
1543 1646
1544sub set_fontsize { 1647sub set_fontsize {
1545 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1546 1649
1547 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1548 delete $self->{texture}; 1651 delete $self->{texture};
1549 1652
1550 $self->update; 1653 $self->realloc;
1551 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1552} 1662}
1553 1663
1554sub _draw { 1664sub _draw {
1555 my ($self) = @_; 1665 my ($self) = @_;
1556 1666
… …
1562 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1563 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1564 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1565 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1676
1567 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1568 1679
1680 unless (exists $self->{ox}) {
1569 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1570 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1571 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1572 1684
1573 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1574 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1575 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1576
1577 $tex
1578 }; 1688 };
1579 1689
1580 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1582 1694
1583 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1584 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1585 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1586 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1587 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1588 } 1702 }
1589 1703
1590 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1591} 1705}
1592 1706
… …
1609 can_hover => 1, 1723 can_hover => 1,
1610 can_focus => 1, 1724 can_focus => 1,
1611 valign => 0, 1725 valign => 0,
1612 can_events => 1, 1726 can_events => 1,
1613 #text => ... 1727 #text => ...
1728 #hidden => "*",
1614 @_ 1729 @_
1615 ) 1730 )
1616} 1731}
1617 1732
1618sub _set_text { 1733sub _set_text {
… …
1620 1735
1621 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1622 1737
1623 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1624 1739
1625 delete $self->{texture};
1626
1627 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1628 $self->{text} = $text; 1741 $self->{text} = $text;
1629 1742
1630 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1631 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1632 1746
1633 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1634} 1751}
1635 1752
1636sub set_text { 1753sub set_text {
1637 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1638 1755
1639 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1640 $self->_set_text ($text); 1757 $self->_set_text ($text);
1641 $self->update;
1642 $self->check_size;
1643} 1758}
1644 1759
1645sub get_text { 1760sub get_text {
1646 $_[0]{text} 1761 $_[0]{text}
1647} 1762}
… …
1677 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1678 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1679 $self->_emit ('escape'); 1794 $self->_emit ('escape');
1680 } elsif ($uni) { 1795 } elsif ($uni) {
1681 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1682 } 1799 }
1683 1800
1684 $self->_set_text ($text); 1801 $self->_set_text ($text);
1685 $self->update; 1802
1686 $self->check_size; 1803 $self->realloc;
1804
1805 1
1687} 1806}
1688 1807
1689sub focus_in { 1808sub focus_in {
1690 my ($self) = @_; 1809 my ($self) = @_;
1691 1810
… …
1706 utf8::encode $text; 1825 utf8::encode $text;
1707 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1708 1827
1709 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1710 $self->update; 1829 $self->update;
1830
1831 1
1711} 1832}
1712 1833
1713sub mouse_motion { 1834sub mouse_motion {
1714 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1715# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 0
1716} 1839}
1717 1840
1718sub _draw { 1841sub _draw {
1719 my ($self) = @_; 1842 my ($self) = @_;
1720 1843
1721 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1722 1845
1723 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1724 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1725 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1726 } else { 1849 } else {
1727 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1728 } 1851 }
1729 1852
1730 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1732 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1733 glVertex 0 , 0; 1856 glVertex 0 , 0;
1734 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1735 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1736 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1797 } else { 1920 } else {
1798 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1799 } 1922 }
1800 1923
1801 } else { 1924 } else {
1802 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1803 } 1928 1
1804
1805} 1929}
1806 1930
1807############################################################################# 1931#############################################################################
1808 1932
1809package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1818 1942
1819sub new { 1943sub new {
1820 my $class = shift; 1944 my $class = shift;
1821 1945
1822 $class->SUPER::new ( 1946 $class->SUPER::new (
1823 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1824 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1825 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1826 can_hover => 1, 1951 can_hover => 1,
1827 align => 0, 1952 align => 0,
1828 valign => 0, 1953 valign => 0,
… …
1837 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1838 1963
1839 $self->emit ("activate") 1964 $self->emit ("activate")
1840 if $x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1841 && $y >= 0 && $y < $self->{h}; 1966 && $y >= 0 && $y < $self->{h};
1967
1968 1
1842} 1969}
1843 1970
1844sub _draw { 1971sub _draw {
1845 my ($self) = @_; 1972 my ($self) = @_;
1846 1973
1847 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1848
1849 if ($GRAB == $self) {
1850 $self->{fg} = $self->{active_fg};
1851 }
1852 1975
1853 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1855 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1856 1979
… …
1861 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1862} 1985}
1863 1986
1864############################################################################# 1987#############################################################################
1865 1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
2023}
2024
2025#############################################################################
2026
1866package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1867 2028
1868our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1869 2030
1870my @tex = 2031my @tex =
… …
1875 2036
1876sub new { 2037sub new {
1877 my $class = shift; 2038 my $class = shift;
1878 2039
1879 $class->SUPER::new ( 2040 $class->SUPER::new (
1880 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1881 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1882 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1883 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1884 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1885 state => 0, 2047 state => 0,
… …
1889} 2051}
1890 2052
1891sub size_request { 2053sub size_request {
1892 my ($self) = @_; 2054 my ($self) = @_;
1893 2055
1894 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1895} 2057}
1896 2058
1897sub button_down { 2059sub button_down {
1898 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1899 2061
1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1902 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1903 $self->_emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1904 } 2070 1
1905} 2071}
1906 2072
1907sub _draw { 2073sub _draw {
1908 my ($self) = @_; 2074 my ($self) = @_;
1909 2075
1910 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1911 2077
1912 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1913 2079
1914 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1915 2083
1916 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1917 2085
1918 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1919 2087
… …
2074 2242
2075 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
2076 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
2077 2245
2078 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
2079 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2080 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
2081 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2082 2251
2083 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2084 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2184 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2185 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2186 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2187 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2188 range => [0, 0, 100, 10, 0], 2357 range => [0, 0, 100, 10, 0],
2189 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2190 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2191 vertical => 0, 2360 vertical => 0,
2192 can_hover => 1, 2361 can_hover => 1,
2193 inner_pad => 0.02, 2362 inner_pad => 0.02,
2194 @_ 2363 @_
2195 ); 2364 );
… …
2198 $self->update; 2367 $self->update;
2199 2368
2200 $self 2369 $self
2201} 2370}
2202 2371
2372sub changed { }
2373
2203sub set_range { 2374sub set_range {
2204 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2205 2376
2206 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2207 2378
2208 $self->update
2209 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2210} 2383}
2211 2384
2212sub set_value { 2385sub set_value {
2213 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2214 2387
… …
2233} 2406}
2234 2407
2235sub size_request { 2408sub size_request {
2236 my ($self) = @_; 2409 my ($self) = @_;
2237 2410
2238 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2239 my $h = $self->{req_h};
2240
2241 $self->{vertical} ? ($h, $w) : ($w, $h)
2242} 2412}
2243 2413
2244sub button_down { 2414sub button_down {
2245 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2246 2416
2247 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2248 2418
2249 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250 2420
2251 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2252} 2422}
2253 2423
2254sub mouse_motion { 2424sub mouse_motion {
2255 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2256 2426
… …
2260 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2261 2431
2262 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2263 2433
2264 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else {
2436 return 0;
2437 }
2438
2265 } 2439 1
2266} 2440}
2267 2441
2268sub update { 2442sub update {
2269 my ($self) = @_; 2443 my ($self) = @_;
2270 2444
2271 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2445 delete $self->{knob_w};
2446 $self->SUPER::update;
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 unless ($self->{knob_w}) {
2272 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2273 2454
2274 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100; 2456 my $range = ($hi - $page - $lo) || 1e-100;
2276 2457
… …
2282 $value = ($value - $lo) / $range; 2463 $value = ($value - $lo) / $range;
2283 $value = $value * $self->{scale} + $self->{offset}; 2464 $value = $value * $self->{scale} + $self->{offset};
2284 2465
2285 $self->{knob_x} = $value - $knob_w * 0.5; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2286 $self->{knob_w} = $knob_w; 2467 $self->{knob_w} = $knob_w;
2287 }); 2468 }
2288
2289 $self->SUPER::update;
2290}
2291
2292sub _draw {
2293 my ($self) = @_;
2294 2469
2295 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2296 2471
2297 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2298 2473
… …
2359sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2360sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2361 2536
2362############################################################################# 2537#############################################################################
2363 2538
2364package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2365 2540
2366our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2367 2542
2368use CFClient::OpenGL; 2543use CFClient::OpenGL;
2369 2544
… …
2371 my $class = shift; 2546 my $class = shift;
2372 2547
2373 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2374 fontsize => 1, 2549 fontsize => 1,
2375 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2376 #font => default_font 2552 #font => default_font
2377 @_, 2553 @_,
2378 2554
2379 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2380 par => [], 2556 par => [],
… …
2403 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2404 2580
2405 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2406 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $self->{layout}->set_width ($self->{children}[0]{w}); 2583 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2408 2585
2409 $self->reflow; 2586 $self->reflow;
2410} 2587}
2411 2588
2412sub text_size { 2589sub text_size {
… …
2414 2591
2415 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2416 2593
2417 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2418 $layout->set_width ($self->{children}[0]{w} - $indent); 2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2419 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2420 2598
2421 $layout->size 2599 $layout->size
2422} 2600}
2423 2601
… …
2462 2640
2463 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2464 2642
2465 delete $self->{texture}; 2643 delete $self->{texture};
2466 2644
2467 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2468 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2469 2647
2470 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2471 my $height = 0; 2649 my $height = 0;
2472 2650
… …
2475 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2476 2654
2477 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2478 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2479 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2480 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2481 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2482 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2483 $_->[1] = $h; 2662 $_->[1] = $h;
2484 } 2663 }
… …
2487 } 2666 }
2488 2667
2489 $self->{height} = $height; 2668 $self->{height} = $height;
2490 2669
2491 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2492 2671
2493 delete $self->{texture}; 2672 delete $self->{texture};
2494 } 2673 }
2495 2674
2496 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2497 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2498 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2499 2678
2500 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2501 2680
2502 my $y0 = $top; 2681 my $y0 = $top;
… …
2516 my $h = $par->[1]; 2695 my $h = $par->[1];
2517 2696
2518 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2519 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2520 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2521 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2522 2702
2523 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2524 2704
2525 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2537sub _draw { 2717sub _draw {
2538 my ($self) = @_; 2718 my ($self) = @_;
2539 2719
2540 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2542 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2543 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2544 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2545 2725
2546 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2547 2727
2548} 2728}
… …
2631} 2811}
2632 2812
2633sub set_tooltip_from { 2813sub set_tooltip_from {
2634 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2635 2815
2816 my $tooltip = $widget->{tooltip};
2817
2818 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2821 . "req $widget->{req_w} $widget->{req_h}\n"
2822 . "visible $widget->{visible}";
2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2827
2636 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2637 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2638 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639 fontsize => 0.8, 2831 fontsize => 0.8,
2640 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2641 ellipsise => 0, 2833 ellipsise => 0,
2642 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2653 2845
2654sub size_allocate { 2846sub size_allocate {
2655 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2656 2848
2657 $self->SUPER::size_allocate ($w - 4, $h - 4); 2849 $self->SUPER::size_allocate ($w - 4, $h - 4);
2850}
2851
2852sub visibility_change {
2853 my ($self, $visible) = @_;
2854
2855 return unless $visible;
2856
2857 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner}
2859 or return;
2860
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w};
2865
2866 $self->move_abs ($x, $y);
2867 });
2658} 2868}
2659 2869
2660sub _draw { 2870sub _draw {
2661 my ($self) = @_; 2871 my ($self) = @_;
2662 2872
… …
2679 glVertex $w, $h; 2889 glVertex $w, $h;
2680 glVertex $w, 0; 2890 glVertex $w, 0;
2681 glEnd; 2891 glEnd;
2682 2892
2683 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2684 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2685} 2896}
2686 2897
2687############################################################################# 2898#############################################################################
2688 2899
… …
2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748 2959
2749 if ($tex) { 2960 if ($tex) {
2750 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2755 } 2966 }
2756} 2967}
2757 2968
2758sub DESTROY { 2969sub destroy {
2759 my ($self) = @_; 2970 my ($self) = @_;
2760 2971
2761 $self->{timer}->cancel 2972 $self->{timer}->cancel
2762 if $self->{timer}; 2973 if $self->{timer};
2763 2974
2764 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2765} 2976}
2766 2977
2767############################################################################# 2978#############################################################################
2768 2979
2769package CFClient::UI::Inventory; 2980package CFClient::UI::Buttonbar;
2770 2981
2771our @ISA = CFClient::UI::ScrolledWindow::; 2982our @ISA = CFClient::UI::HBox::;
2772 2983
2773sub new { 2984# 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 2985
2814############################################################################# 2986#############################################################################
2815 2987
2816package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2817 2989
… …
2829 ); 3001 );
2830 3002
2831 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2832 3004
2833 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2834 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2835 3007
2836 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2837 if (!ref $widget) { 3009 if (!ref $widget) {
2838 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2839 can_hover => 1, 3011 can_hover => 1,
2840 can_events => 1, 3012 can_events => 1,
2841 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2842 } 3015 }
2843 3016
2844 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2845 3018
2846 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2858 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 3032 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2861 3034
2862 $self->show; 3035 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864} 3037}
2865 3038
2866sub mouse_motion { 3039sub mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2868 3041
2869 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2872} 3047}
2873 3048
2874sub button_up { 3049sub button_up {
2875 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2876 3051
… …
2878 undef $GRAB; 3053 undef $GRAB;
2879 $self->hide; 3054 $self->hide;
2880 3055
2881 $self->_emit ("popdown"); 3056 $self->_emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2883 } 3062 1
2884} 3063}
2885 3064
2886############################################################################# 3065#############################################################################
2887 3066
2888package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2889 3068
2890our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2891 3070
2892sub new { 3071sub new {
2893 my $class = shift; 3072 my $class = shift;
2894 3073
2895 $class->SUPER::new ( 3074 my $self = $class->SUPER::new (
3075 @_,
3076 );
3077
3078 $self->{current} = $self->{children}[0]
3079 if @{ $self->{children} };
3080
3081 $self
3082}
3083
3084sub add {
3085 my ($self, @widgets) = @_;
3086
3087 $self->SUPER::add (@widgets);
3088
3089 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} };
3091}
3092
3093sub set_current_page {
3094 my ($self, $page_or_widget) = @_;
3095
3096 my $widget = ref $page_or_widget
3097 ? $page_or_widget
3098 : $self->{children}[$page_or_widget];
3099
3100 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102
3103 $self->_emit (page_changed => $self->{current});
3104
3105 $self->realloc;
3106}
3107
3108sub visible_children {
3109 $_[0]{current}
3110}
3111
3112sub size_request {
3113 my ($self) = @_;
3114
3115 $self->{current}->size_request
3116}
3117
3118sub size_allocate {
3119 my ($self, $w, $h) = @_;
3120
3121 $self->{current}->configure (0, 0, $w, $h);
3122}
3123
3124sub _draw {
3125 my ($self) = @_;
3126
3127 $self->{current}->draw;
3128}
3129
3130#############################################################################
3131
3132package CFClient::UI::Notebook;
3133
3134our @ISA = CFClient::UI::VBox::;
3135
3136sub new {
3137 my $class = shift;
3138
3139 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self
3143 @_,
3144 );
3145
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148
3149 $self
3150}
3151
3152sub add {
3153 my ($self, $title, $widget, $tooltip) = @_;
3154
3155 Scalar::Util::weaken $self;
3156
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget);
3164}
3165
3166sub set_current_page {
3167 my ($self, $page) = @_;
3168
3169 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Combobox;
3176
3177use utf8;
3178
3179our @ISA = CFClient::UI::Button::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 options => [], # [value, title, longdesc], ...
3186 value => undef,
3187 @_,
3188 );
3189
3190 $self->_set_value ($self->{value});
3191
3192 $self
3193}
3194
3195sub button_down {
3196 my ($self, $ev) = @_;
3197
3198 my @menu_items;
3199
3200 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_;
3202
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 }
3205
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207}
3208
3209sub _set_value {
3210 my ($self, $value) = @_;
3211
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3213 or return;
3214
3215 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]);
3218}
3219
3220sub set_value {
3221 my ($self, $value) = @_;
3222
3223 return unless $self->{value} ne $value;
3224
3225 $self->_set_value ($value);
3226 $self->_emit (changed => $value);
3227}
3228
3229#############################################################################
3230
3231package CFClient::UI::Statusbox;
3232
3233our @ISA = CFClient::UI::VBox::;
3234
3235sub new {
3236 my $class = shift;
3237
3238 my $self = $class->SUPER::new (
2896 fontsize => 0.8, 3239 fontsize => 0.8,
2897 @_, 3240 @_,
2898 ) 3241 );
3242
3243 Scalar::Util::weaken (my $this = $self);
3244
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246
3247 $self
2899} 3248}
2900 3249
2901sub reorder { 3250sub reorder {
2902 my ($self) = @_; 3251 my ($self) = @_;
2903 my $NOW = time; 3252 my $NOW = Time::HiRes::time;
3253
3254 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} };
2904 3258
2905 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 } 3261 }
2908 3262
… …
2911 my @items = sort { 3265 my @items = sort {
2912 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2915 3269
3270 $self->{timer}->interval (1);
3271
2916 my $count = 10 + 1; 3272 my $count = 10 + 1;
2917 for my $item (@items) { 3273 for my $item (@items) {
2918 last unless --$count; 3274 last unless --$count;
2919 3275
2920 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text}; 3280 : $item->{text};
2925 3281
… …
2933 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2939 can_events => 1, 3295 can_events => 1,
2940 can_hover => 1 3296 can_hover => 1
2941 }; 3297 };
3298
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1;
3304 $self->{timer}->interval (1/30);
3305 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 }
3308
3309 push @widgets, $label;
2942 } 3310 }
2943 3311
2944 $self->clear; 3312 $self->clear;
2945 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2946} 3314}
… …
2951 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2953 3321
2954 return unless $text; 3322 return unless $text;
2955 3323
2956 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2957 3325
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959 3327
2960 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2962 $item->{count}++; 3330 $item->{count}++;
2963 } else { 3331 } else {
2964 $item->{count} = 1; 3332 $item->{count} = 1;
2965 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2966 } 3334 }
2967 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2968 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2969 delete $item->{label}; 3337 delete $item->{label};
2970 } else { 3338 } else {
2971 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2972 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
2991 3359
2992 $self->reorder; 3360 $self->reorder;
2993 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2994} 3362}
2995 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2996############################################################################# 3372#############################################################################
2997 3373
2998package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
2999 3375
3000our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
3001
3002use CFClient::OpenGL;
3003 3377
3004sub new { 3378sub new {
3005 my $class = shift; 3379 my $class = shift;
3006 3380
3007 $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit, $end_cb) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 }
3610}
3611
3612#############################################################################
3613
3614package CFClient::UI::SpellList;
3615
3616our @ISA = CFClient::UI::Table::;
3617
3618sub new {
3619 my $class = shift;
3620
3621 my $self = $class->SUPER::new (
3622 binding => [],
3623 commands => [],
3624 @_,
3625 )
3626}
3627
3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3629
3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640
3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3713sub add_spell {
3714 my ($self, $spell) = @_;
3715
3716 $self->{spell}->{$spell->{name}} = $spell;
3717 $self->rebuild_spell_list;
3718}
3719
3720sub remove_spell {
3721 my ($self, $spell) = @_;
3722
3723 delete $self->{spell}->{$spell->{name}};
3724 $self->rebuild_spell_list;
3725}
3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3731 $self->rebuild_spell_list;
3732}
3733
3734#############################################################################
3735
3736package CFClient::UI::Root;
3737
3738our @ISA = CFClient::UI::Container::;
3739
3740use List::Util qw(min max);
3741
3742use CFClient::OpenGL;
3743
3744sub new {
3745 my $class = shift;
3746
3747 my $self = $class->SUPER::new (
3008 visible => 1, 3748 visible => 1,
3009 @_, 3749 @_,
3010 ) 3750 );
3011}
3012 3751
3013sub configure { 3752 Scalar::Util::weaken ($self->{root} = $self);
3014 my ($self, $x, $y, $w, $h) = @_;
3015 3753
3016 $self->{w} = $w; 3754 $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} 3755}
3026 3756
3027sub size_request { 3757sub size_request {
3028 my ($self) = @_; 3758 my ($self) = @_;
3029 3759
3030 ($self->{w}, $self->{h}) 3760 ($self->{w}, $self->{h})
3761}
3762
3763sub _to_pixel {
3764 my ($coord, $size, $max) = @_;
3765
3766 $coord =
3767 $coord eq "center" ? ($max - $size) * 0.5
3768 : $coord eq "max" ? $max
3769 : $coord;
3770
3771 $coord = 0 if $coord < 0;
3772 $coord = $max - $size if $coord > $max - $size;
3773
3774 int $coord + 0.5
3031} 3775}
3032 3776
3033sub size_allocate { 3777sub size_allocate {
3034 my ($self, $w, $h) = @_; 3778 my ($self, $w, $h) = @_;
3035 3779
3036 for my $child ($self->children) { 3780 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3782
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3783 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3784 $Y = $child->{force_y} if exists $child->{force_y};
3041 3785
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3786 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3787 $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 3788
3051 $child->configure ($X, $Y, $W, $H); 3789 $child->configure ($X, $Y, $W, $H);
3052 } 3790 }
3053} 3791}
3054 3792
… …
3065} 3803}
3066 3804
3067sub update { 3805sub update {
3068 my ($self) = @_; 3806 my ($self) = @_;
3069 3807
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3808 $::WANT_REFRESH++;
3072} 3809}
3073 3810
3074sub add { 3811sub add {
3075 my ($self, @children) = @_; 3812 my ($self, @children) = @_;
3076 3813
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; 3814 $_->{is_toplevel} = 1
3085 3815 for @children;
3086 # integerise window positions
3087 $child->{x} = int $child->{x};
3088 $child->{y} = int $child->{y};
3089 }
3090 3816
3091 $self->SUPER::add (@children); 3817 $self->SUPER::add (@children);
3092} 3818}
3093 3819
3094sub remove { 3820sub remove {
3095 my ($self, @children) = @_; 3821 my ($self, @children) = @_;
3096 3822
3097 $self->SUPER::remove (@children); 3823 $self->SUPER::remove (@children);
3824
3825 delete $self->{is_toplevel}
3826 for @children;
3098 3827
3099 while (@children) { 3828 while (@children) {
3100 my $w = pop @children; 3829 my $w = pop @children;
3101 push @children, $w->children; 3830 push @children, $w->children;
3102 $w->set_invisible; 3831 $w->set_invisible;
… …
3121 while ($self->{refresh_hook}) { 3850 while ($self->{refresh_hook}) {
3122 $_->() 3851 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3852 for values %{delete $self->{refresh_hook}};
3124 } 3853 }
3125 3854
3126 if ($self->{check_size}) { 3855 if ($self->{realloc}) {
3856 my %queue;
3127 my @queue; 3857 my @queue;
3858 my $widget;
3128 3859
3129 for (;;) { 3860 outer:
3130 if ($self->{check_size}) { 3861 while () {
3131 #TODO use array-of-depth approach 3862 if (my $realloc = delete $self->{realloc}) {
3863 for $widget (values %$realloc) {
3864 $widget->{visible} or next; # do not resize invisible widgets
3132 3865
3133 @queue = sort { $a->{visible} <=> $b->{visible} } 3866 $queue{$widget+0}++ and next; # duplicates are common
3134 @queue, values %{delete $self->{check_size}}; 3867
3868 push @{ $queue[$widget->{visible}] }, $widget;
3869 }
3135 } 3870 }
3136 3871
3872 while () {
3873 @queue or last outer;
3874
3137 my $widget = pop @queue || last; 3875 $widget = pop @{ $queue[-1] || [] }
3138 3876 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 3877
3878 pop @queue;
3879 }
3880
3881 delete $queue{$widget+0};
3882
3883 my ($w, $h) = $widget->size_request;
3884
3885 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3886 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3887
3888 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3889 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3890
3891 $w = $widget->{force_w} if exists $widget->{force_w};
3892 $h = $widget->{force_h} if exists $widget->{force_h};
3893
3894 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3895 || delete $widget->{force_realloc}) {
3149 $widget->{req_w} = $w; 3896 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h; 3897 $widget->{req_h} = $h;
3151 3898
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3899 $self->{size_alloc}{$widget+0} = $widget;
3153 3900
3154 $widget->{parent}->check_size
3155 if $widget->{parent}; 3901 if (my $parent = $widget->{parent}) {
3902 $self->{realloc}{$parent+0} = $parent
3903 unless $queue{$parent+0};
3904
3905 $parent->{force_size_alloc} = 1;
3906 $self->{size_alloc}{$parent+0} = $parent;
3907 }
3156 } 3908 }
3909
3910 delete $self->{realloc}{$widget+0};
3157 } 3911 }
3158 } 3912 }
3159 3913
3160 while ($self->{size_alloc}) { 3914 while (my $size_alloc = delete $self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) { 3915 my @queue = sort { $b->{visible} <=> $a->{visible} }
3162 my ($widget, $w, $h) = @$_; 3916 values %$size_alloc;
3917
3918 while () {
3919 my $widget = pop @queue || last;
3920
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3163 3922
3164 $w = 0 if $w < 0; 3923 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0; 3924 $h = 0 if $h < 0;
3166 3925
3926 $w = int $w + 0.5;
3927 $h = int $h + 0.5;
3928
3929 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930 $widget->{old_w} = $widget->{w};
3931 $widget->{old_h} = $widget->{h};
3932
3167 $widget->{w} = $w; 3933 $widget->{w} = $w;
3168 $widget->{h} = $h; 3934 $widget->{h} = $h;
3935
3169 $widget->emit (size_allocate => $w, $h); 3936 $widget->emit (size_allocate => $w, $h);
3937 }
3170 } 3938 }
3171 } 3939 }
3172 3940
3173 while ($self->{post_alloc_hook}) { 3941 while ($self->{post_alloc_hook}) {
3174 $_->() 3942 $_->()
3175 for values %{delete $self->{post_alloc_hook}}; 3943 for values %{delete $self->{post_alloc_hook}};
3176 } 3944 }
3945
3177 3946
3178 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3180 glClear GL_COLOR_BUFFER_BIT; 3949 glClear GL_COLOR_BUFFER_BIT;
3181 3950
… …
3183 glLoadIdentity; 3952 glLoadIdentity;
3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3185 glMatrixMode GL_MODELVIEW; 3954 glMatrixMode GL_MODELVIEW;
3186 glLoadIdentity; 3955 glLoadIdentity;
3187 3956
3957 {
3958 package CFClient::UI::Base;
3959
3960 ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h});
3962 }
3963
3188 $self->_draw; 3964 $self->_draw;
3189} 3965}
3190 3966
3191############################################################################# 3967#############################################################################
3192 3968

Diff Legend

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