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.236 by root, Thu May 25 16:54:29 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 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;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 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;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
94 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
95 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
96 $grab->update if $grab; 116 $grab->update if $grab;
97 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
98 118
99 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
100 } 120 }
101} 121}
102 122
103sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
104 my ($ev) = @_; 124 my ($ev) = @_;
… …
110 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
111 131
112 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
113 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
114 134
115 check_tooltip; 135 $TOOLTIP_WATCHER->start;
116 } 136 }
117 137
118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
119 if $HOVER; 139 if $HOVER;
120} 140}
… …
152sub rescale_widgets { 172sub rescale_widgets {
153 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
154 174
155 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
156 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
157 $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.]+$/;
158 $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};
159 $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};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $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.]+$/;
162 $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};
163 $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};
164 $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
165 } 190 }
166 } 191 }
167 192
168 reconfigure_widgets; 193 reconfigure_widgets;
169} 194}
… …
178 203
179sub new { 204sub new {
180 my $class = shift; 205 my $class = shift;
181 206
182 my $self = bless { 207 my $self = bless {
183 x => 0, 208 x => "center",
184 y => 0, 209 y => "center",
185 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
186 can_events => 1, 213 can_events => 1,
187 @_ 214 @_
188 }, $class; 215 }, $class;
189 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
190 for (keys %$self) { 219 for (keys %$self) {
191 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
193 } 222 }
194 } 223 }
195 224
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
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};
235 }
197 236
198 $self 237 $self
199} 238}
200 239
201sub destroy { 240sub destroy {
… …
205 %$self = (); 244 %$self = ();
206} 245}
207 246
208sub show { 247sub show {
209 my ($self) = @_; 248 my ($self) = @_;
249
210 return if $self->{parent}; 250 return if $self->{parent};
211 251
212 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
213} 253}
214 254
215sub show_centered { 255sub set_visible {
216 my ($self) = @_; 256 my ($self) = @_;
257
217 return if $self->{parent}; 258 return if $self->{visible};
218 259
219 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
220 262
221 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 264
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
224 }, 266
225 ); 267 $_->set_visible for $self->children;
226} 268}
227 269
228sub set_invisible { 270sub set_invisible {
229 my ($self) = @_; 271 my ($self) = @_;
230 272
231 # broken show/hide model 273 return unless $self->{visible};
232 274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
233 delete $self->{visible}; 278 delete $self->{visible};
234 279
235 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
237 282
238 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
240 285
241 $self->focus_out; 286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
242} 306}
243 307
244sub hide { 308sub hide {
245 my ($self) = @_; 309 my ($self) = @_;
246 310
… …
248 312
249 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
250 if $self->{parent}; 314 if $self->{parent};
251} 315}
252 316
253sub move { 317sub move_abs {
254 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
255 319
256 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
259 323
260 $self->update; 324 $self->update;
261} 325}
262 326
263sub set_size { 327sub set_size {
264 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
265 329
266 $self->{user_w} = $w; 330 $self->{force_w} = $w;
267 $self->{user_h} = $h; 331 $self->{force_h} = $h;
268 332
269 $self->check_size; 333 $self->realloc;
270} 334}
271 335
272sub size_request { 336sub size_request {
273 require Carp; 337 require Carp;
274 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
276 340
277sub configure { 341sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
279 343
280 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
283 349
284 # use alignment to adjust x, y 350 # use alignment to adjust x, y
285 351
286 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 354 }
291 355
292 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 357 $self->{x} = $x;
294 $self->{y} = $y; 358 $self->{y} = $y;
295 $self->update; 359 $self->update;
296 } 360 }
297 361
298 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $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;
300 } 369 }
301} 370}
302 371
303sub size_allocate { 372sub size_allocate {
304 # nothing to be done 373 # nothing to be done
305} 374}
306 375
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
315} 382}
316 383
317sub set_max_size { 384sub set_max_size {
318 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
319 386
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
322} 391}
323 392
324sub set_tooltip { 393sub set_tooltip {
325 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
326 395
… …
331 400
332 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
333 402
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
337 } 406 }
338} 407}
339 408
340# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
341sub coord2local { 410sub coord2local {
… …
378 447
379 $::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
380 unless $FOCUS; 449 unless $FOCUS;
381} 450}
382 451
383sub mouse_motion { } 452sub mouse_motion { 0 }
384sub button_up { } 453sub button_up { 0 }
385sub key_down { } 454sub key_down { 0 }
386sub key_up { } 455sub key_up { 0 }
387 456
388sub button_down { 457sub button_down {
389 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
390 459
391 $self->focus_in; 460 $self->focus_in;
392}
393 461
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
398sub 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 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc;
536 $self->update;
537}
538
539# using global variables seems a bit hacky, but passing through all drawing
540# functions seems pointless.
541our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399 542
400sub draw { 543sub draw {
401 my ($self) = @_; 544 my ($self) = @_;
402 545
403 return unless $self->{h} && $self->{w}; 546 return unless $self->{h} && $self->{w};
547
548 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553
554 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 557
405 glPushMatrix; 558 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 559 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 560
410 if ($self == $HOVER && $self->{can_hover}) { 561 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 563 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 565 glBegin GL_QUADS;
417 glVertex $x , $y; 566 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 567 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 568 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 569 glVertex 0 , $self->{h};
421 glEnd; 570 glEnd;
422 glDisable GL_BLEND; 571 glDisable GL_BLEND;
423 } 572 }
424 573
425 if ($ENV{PCLIENT_DEBUG}) { 574 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 575 glPushMatrix;
427 glColor 1, 1, 0, 1; 576 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 577 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 578 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 579 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 580 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 581 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 582 glVertex 0 , $self->{h} - 1;
434 glEnd; 583 glEnd;
435 glPopMatrix; 584 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 585 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 } 586 }
587
588 $self->_draw;
589 glPopMatrix;
438} 590}
439 591
440sub _draw { 592sub _draw {
441 my ($self) = @_; 593 my ($self) = @_;
442 594
443 warn "no draw defined for $self\n"; 595 warn "no draw defined for $self\n";
444}
445
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
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} 596}
502 597
503sub DESTROY { 598sub DESTROY {
504 my ($self) = @_; 599 my ($self) = @_;
505 600
… …
537 632
538 if ($color && (@$color < 4 || $color->[3])) { 633 if ($color && (@$color < 4 || $color->[3])) {
539 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
540 635
541 glEnable GL_BLEND; 636 glEnable GL_BLEND;
542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
543 glColor @$color; 638 glColor_premultiply @$color;
544 639
545 glBegin GL_QUADS; 640 glBegin GL_QUADS;
546 glVertex 0 , 0; 641 glVertex 0 , 0;
547 glVertex 0 , $h; 642 glVertex 0 , $h;
548 glVertex $w, $h; 643 glVertex $w, $h;
… …
563 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
564 $class->SUPER::new (can_events => 0, %arg); 659 $class->SUPER::new (can_events => 0, %arg);
565} 660}
566 661
567sub size_request { 662sub size_request {
568 (0, 0) 663 my ($self) = @_;
664
665 ($self->{w} + 0, $self->{h} + 0)
569} 666}
570 667
571sub draw { } 668sub draw { }
572 669
573############################################################################# 670#############################################################################
… …
577our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
578 675
579sub new { 676sub new {
580 my ($class, %arg) = @_; 677 my ($class, %arg) = @_;
581 678
582 my $children = delete $arg{children} || []; 679 my $children = delete $arg{children};
583 680
584 my $self = $class->SUPER::new ( 681 my $self = $class->SUPER::new (
585 children => [], 682 children => [],
586 can_events => 0, 683 can_events => 0,
587 %arg, 684 %arg,
588 ); 685 );
686
589 $self->add ($_) for @$children; 687 $self->add (@$children)
688 if $children;
590 689
591 $self 690 $self
592} 691}
593 692
594sub add { 693sub add {
… …
602 $self->{children} = [ 701 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 702 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 703 @{$self->{children}}, @widgets
605 ]; 704 ];
606 705
607 $self->check_size (1); 706 $self->realloc;
608 $self->update;
609} 707}
610 708
611sub children { 709sub children {
612 @{ $_[0]{children} } 710 @{ $_[0]{children} }
613} 711}
… …
618 delete $child->{parent}; 716 delete $child->{parent};
619 $child->hide; 717 $child->hide;
620 718
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 719 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 720
623 $self->check_size (1); 721 $self->realloc;
624 $self->update;
625} 722}
626 723
627sub clear { 724sub clear {
628 my ($self) = @_; 725 my ($self) = @_;
629 726
… …
633 for (@$children) { 730 for (@$children) {
634 delete $_->{parent}; 731 delete $_->{parent};
635 $_->hide; 732 $_->hide;
636 } 733 }
637 734
638 $self->check_size; 735 $self->realloc;
639 $self->update;
640} 736}
641 737
642sub find_widget { 738sub find_widget {
643 my ($self, $x, $y) = @_; 739 my ($self, $x, $y) = @_;
644 740
645 $x -= $self->{x}; 741 $x -= $self->{x};
646 $y -= $self->{y}; 742 $y -= $self->{y};
647 743
648 my $res; 744 my $res;
649 745
650 for (reverse @{ $self->{children} }) { 746 for (reverse $self->visible_children) {
651 $res = $_->find_widget ($x, $y) 747 $res = $_->find_widget ($x, $y)
652 and return $res; 748 and return $res;
653 } 749 }
654 750
655 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
704 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
705} 801}
706 802
707############################################################################# 803#############################################################################
708 804
805# back-buffered drawing area
806
709package CFClient::UI::Window; 807package CFClient::UI::Window;
710 808
711our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
712 810
713use CFClient::OpenGL; 811use CFClient::OpenGL;
… …
731 $self->SUPER::size_allocate ($w, $h); 829 $self->SUPER::size_allocate ($w, $h);
732 $self->update; 830 $self->update;
733} 831}
734 832
735sub _render { 833sub _render {
834 my ($self) = @_;
835
736 $_[0]{children}[0]->draw; 836 $self->{children}[0]->draw;
737} 837}
738 838
739sub render_child { 839sub render_child {
740 my ($self) = @_; 840 my ($self) = @_;
741 841
742 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 842 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
743 glClearColor 0, 0, 0, 0; 843 glClearColor 0, 0, 0, 0;
744 glClear GL_COLOR_BUFFER_BIT; 844 glClear GL_COLOR_BUFFER_BIT;
745 845
846 {
847 package CFClient::UI::Base;
848
849 ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h});
851 }
852
746 $self->_render; 853 $self->_render;
747 }; 854 };
748} 855}
749 856
750sub _draw { 857sub _draw {
751 my ($self) = @_; 858 my ($self) = @_;
752 859
753 my ($w, $h) = ($self->w, $self->h); 860 my ($w, $h) = @$self{qw(w h)};
754 861
755 my $tex = $self->{texture} 862 my $tex = $self->{texture}
756 or return; 863 or return;
757 864
758 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 glColor 1, 1, 1, 1; 867 glColor 0, 0, 0, 1;
761 868
762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
763 870
764 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
765} 872}
… …
781} 888}
782 889
783sub size_request { 890sub size_request {
784 my ($self) = @_; 891 my ($self) = @_;
785 892
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 893 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787 894
788 @$self{qw(child_w child_h)} 895 $w = 10 if $self->{scroll_x};
896 $h = 10 if $self->{scroll_y};
897
898 ($w, $h)
789} 899}
790 900
791sub size_allocate { 901sub size_allocate {
792 my ($self, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
793 903
904 my $child = $self->child;
905
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796 908
797 $self->child->configure (0, 0, $w, $h); 909 $self->child->configure (0, 0, $w, $h);
798 $self->update; 910 $self->update;
799} 911}
800 912
… …
836} 948}
837 949
838sub _render { 950sub _render {
839 my ($self) = @_; 951 my ($self) = @_;
840 952
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
954 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
955
841 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842 957
843 $self->SUPER::_render; 958 $self->SUPER::_render;
844} 959}
845 960
… …
848package CFClient::UI::ScrolledWindow; 963package CFClient::UI::ScrolledWindow;
849 964
850our @ISA = CFClient::UI::HBox::; 965our @ISA = CFClient::UI::HBox::;
851 966
852sub new { 967sub new {
853 my $class = shift; 968 my ($class, %arg) = @_;
969
970 my $child = delete $arg{child};
854 971
855 my $self; 972 my $self;
856 973
857 my $slider = new CFClient::UI::Slider 974 my $slider = new CFClient::UI::Slider
858 vertical => 1, 975 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 976 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 977 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 978 $self->{vp}->set_offset (0, $_[1]);
862 }, 979 },
863 ; 980 ;
864 981
865 $self = $class->SUPER::new ( 982 $self = $class->SUPER::new (
866 vp => (new CFClient::UI::ViewPort expand => 1), 983 vp => (new CFClient::UI::ViewPort expand => 1),
867 slider => $slider, 984 slider => $slider,
868 @_, 985 %arg,
869 ); 986 );
870 987
871 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 988 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child;
874 990
875 $self 991 $self
992}
993
994sub add {
995 my ($self, $widget) = @_;
996
997 $self->{vp}->add ($self->{child} = $widget);
998}
999
1000sub update {
1001 my ($self) = @_;
1002
1003 $self->SUPER::update;
1004
1005 # todo: overwrite size_allocate of child
1006 my $child = $self->{vp}->child;
1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876} 1008}
877 1009
878sub size_allocate { 1010sub size_allocate {
879 my ($self, $w, $h) = @_; 1011 my ($self, $w, $h) = @_;
880 1012
… …
909 1041
910 if ($self->{bg}) { 1042 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)}; 1043 my ($w, $h) = @$self{qw(w h)};
912 1044
913 glEnable GL_BLEND; 1045 glEnable GL_BLEND;
914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1046 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
915 glColor @{ $self->{bg} }; 1047 glColor_premultiply @{ $self->{bg} };
916 1048
917 glBegin GL_QUADS; 1049 glBegin GL_QUADS;
918 glVertex 0 , 0; 1050 glVertex 0 , 0;
919 glVertex 0 , $h; 1051 glVertex 0 , $h;
920 glVertex $w, $h; 1052 glVertex $w, $h;
… …
933 1065
934our @ISA = CFClient::UI::Bin::; 1066our @ISA = CFClient::UI::Bin::;
935 1067
936use CFClient::OpenGL; 1068use CFClient::OpenGL;
937 1069
938my @tex = 1070my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1;
1073
1074my @border =
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1076 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1077
942sub new { 1078sub new {
943 my $class = shift; 1079 my ($class, %arg) = @_;
944 1080
945 # TODO: user_x, user_y, overwrite moveto? 1081 my $title = delete $arg{title};
946 1082
947 my $self = $class->SUPER::new ( 1083 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1084 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1085 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1086 border => 0.6,
951 is_toplevel => 1,
952 can_events => 1, 1087 can_events => 1,
953 @_ 1088 min_w => 16,
1089 min_h => 16,
1090 %arg,
954 ); 1091 );
955 1092
956 $self->{title} &&= new CFClient::UI::Label 1093 $self->{title} = new CFClient::UI::Label
957 align => 0, 1094 align => 0,
958 valign => 1, 1095 valign => 1,
959 text => $self->{title}, 1096 text => $title,
960 fontsize => $self->{border}; 1097 fontsize => $self->{border}
1098 if defined $title;
961 1099
962 $self 1100 $self
1101}
1102
1103sub add {
1104 my ($self, @widgets) = @_;
1105
1106 $self->SUPER::add (@widgets);
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
963} 1108}
964 1109
965sub border { 1110sub border {
966 int $_[0]{border} * $::FONTSIZE 1111 int $_[0]{border} * $::FONTSIZE
967} 1112}
968 1113
969sub size_request { 1114sub size_request {
970 my ($self) = @_; 1115 my ($self) = @_;
1116
1117 $self->{title}->size_request
1118 if $self->{title};
971 1119
972 my ($w, $h) = $self->SUPER::size_request; 1120 my ($w, $h) = $self->SUPER::size_request;
973 1121
974 ( 1122 (
975 $w + $self->border * 2, 1123 $w + $self->border * 2,
… …
978} 1126}
979 1127
980sub size_allocate { 1128sub size_allocate {
981 my ($self, $w, $h) = @_; 1129 my ($self, $w, $h) = @_;
982 1130
1131 if ($self->{title}) {
1132 $self->{title}{w} = $w;
1133 $self->{title}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h);
1135 }
1136
1137 my $border = $self->border;
1138
983 $h -= List::Util::max 0, $self->border * 2; 1139 $h -= List::Util::max 0, $border * 2;
984 $w -= List::Util::max 0, $self->border * 2; 1140 $w -= List::Util::max 0, $border * 2;
985 1141
986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
987 if $self->{title};
988
989 $self->child->configure ($self->border, $self->border, $w, $h); 1142 $self->child->configure ($border, $border, $w, $h);
990} 1143}
991 1144
992sub button_down { 1145sub button_down {
993 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
994 1147
… …
1010 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
1011 1164
1012 my $dx = $ev->{x} - $ox; 1165 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1166 my $dy = $ev->{y} - $oy;
1014 1167
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1170
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018 $self->check_size; 1172 $self->realloc;
1019 }; 1173 };
1020 1174
1021 } elsif ($lr ^ $td) { 1175 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1177 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1179 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
1027 1181
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1183
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031 $self->update; 1185 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1032 }; 1187 };
1188 } else {
1189 return 0;
1190 }
1191
1033 } 1192 1
1034} 1193}
1035 1194
1036sub button_up { 1195sub button_up {
1037 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1038 1197
1039 delete $self->{motion}; 1198 !!delete $self->{motion}
1040} 1199}
1041 1200
1042sub mouse_motion { 1201sub mouse_motion {
1043 my ($self, $ev, $x, $y) = @_; 1202 my ($self, $ev, $x, $y) = @_;
1044 1203
1045 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1204 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205
1206 !!$self->{motion}
1046} 1207}
1047 1208
1048sub _draw { 1209sub _draw {
1049 my ($self) = @_; 1210 my ($self) = @_;
1050 1211
1212 my $child = $self->{children}[0];
1213
1051 my ($w, $h ) = ($self->{w}, $self->{h}); 1214 my ($w, $h ) = ($self->{w}, $self->{h});
1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1215 my ($cw, $ch) = ($child->{w}, $child->{h});
1053 1216
1054 glEnable GL_TEXTURE_2D; 1217 glEnable GL_TEXTURE_2D;
1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056 1219
1057 my $border = $self->border; 1220 my $border = $self->border;
1058 1221
1059 glColor @{ $self->{border_bg} }; 1222 glColor @{ $self->{border_bg} };
1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1223 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064 1227
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066 my $bg = $tex[0]; 1229 glColor @{ $self->{bg} };
1067 1230
1068 # TODO: repeat texture not scale 1231 # TODO: repeat texture not scale
1232 # solve this better(?)
1069 my $rep_x = $cw / $bg->{w}; 1233 $bg->{s} = $cw / $bg->{w};
1070 my $rep_y = $ch / $bg->{h}; 1234 $bg->{t} = $ch / $bg->{h};
1071
1072 glColor @{ $self->{bg} };
1073
1074 $bg->{s} = $rep_x;
1075 $bg->{t} = $rep_y;
1076 $bg->{wrap_mode} = 1;
1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1235 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 } 1236 }
1079 1237
1080 glDisable GL_TEXTURE_2D; 1238 glDisable GL_TEXTURE_2D;
1081 1239
1082 $self->{title}->draw if $self->{title};
1083
1084 $self->child->draw; 1240 $child->draw;
1241
1242 if ($self->{title}) {
1243 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw;
1245 }
1085} 1246}
1086 1247
1087############################################################################# 1248#############################################################################
1088 1249
1089package CFClient::UI::Table; 1250package CFClient::UI::Table;
… …
1111 my ($self, $x, $y, $child) = @_; 1272 my ($self, $x, $y, $child) = @_;
1112 1273
1113 $child->set_parent ($self); 1274 $child->set_parent ($self);
1114 $self->{children}[$y][$x] = $child; 1275 $self->{children}[$y][$x] = $child;
1115 1276
1116 $self->check_size (1); 1277 $self->realloc;
1117} 1278}
1118 1279
1119# TODO: move to container class maybe? send children a signal on removal? 1280# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1281sub clear {
1121 my ($self) = @_; 1282 my ($self) = @_;
… …
1126 for (@children) { 1287 for (@children) {
1127 delete $_->{parent}; 1288 delete $_->{parent};
1128 $_->hide; 1289 $_->hide;
1129 } 1290 }
1130 1291
1131 $self->check_size (1); 1292 $self->realloc;
1132 $self->update;
1133} 1293}
1134 1294
1135sub get_wh { 1295sub get_wh {
1136 my ($self) = @_; 1296 my ($self) = @_;
1137 1297
… …
1168sub size_allocate { 1328sub size_allocate {
1169 my ($self, $w, $h) = @_; 1329 my ($self, $w, $h) = @_;
1170 1330
1171 my ($ws, $hs) = $self->get_wh; 1331 my ($ws, $hs) = $self->get_wh;
1172 1332
1173 my $req_w = sum @$ws; 1333 my $req_w = (sum @$ws) || 1;
1174 my $req_h = sum @$hs; 1334 my $req_h = (sum @$hs) || 1;
1175 1335
1176 # TODO: nicer code && do row_expand 1336 # TODO: nicer code && do row_expand
1177 my @col_expand = @{$self->{col_expand}}; 1337 my @col_expand = @{$self->{col_expand}};
1178 @col_expand = (1) x @$ws unless @col_expand; 1338 @col_expand = (1) x @$ws unless @col_expand;
1179 my $col_expand = (sum @col_expand) || 1; 1339 my $col_expand = (sum @col_expand) || 1;
… …
1233 } 1393 }
1234} 1394}
1235 1395
1236############################################################################# 1396#############################################################################
1237 1397
1238package CFClient::UI::HBox; 1398package CFClient::UI::Box;
1239
1240# TODO: wrap into common Box base class
1241 1399
1242our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Container::;
1243 1401
1244sub size_request { 1402sub size_request {
1245 my ($self) = @_; 1403 my ($self) = @_;
1246 1404
1247 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $self->{vertical}
1248 1406 ? (
1249 ( 1407 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1250 (List::Util::sum map $_->[0], @alloc), 1408 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1251 (List::Util::max map $_->[1], @alloc), 1409 )
1252 ) 1410 : (
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 )
1253} 1414}
1254 1415
1255sub size_allocate { 1416sub size_allocate {
1256 my ($self, $w, $h) = @_; 1417 my ($self, $w, $h) = @_;
1257 1418
1258 ($h, $w) = ($w, $h); 1419 my $space = $self->{vertical} ? $h : $w;
1259
1260 my $children = $self->{children}; 1420 my $children = $self->{children};
1261 1421
1262 my @h = map $_->{req_w}, @$children; 1422 my @req;
1263 1423
1264 my $req_h = List::Util::sum @h; 1424 if ($self->{homogeneous}) {
1265 1425 @req = ($space / (@$children || 1)) x @$children;
1266 if ($req_h > $h) {
1267 # ah well, not enough space
1268 $_ *= $h / $req_h for @h;
1269 } else { 1426 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1428 my $req = List::Util::sum @req;
1429
1430 if ($req > $space) {
1431 # ah well, not enough space
1432 $_ *= $space / $req for @req;
1433 } else {
1270 my $exp = List::Util::sum map $_->{expand}, @$children; 1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1271 $exp ||= 1;
1272 1435
1436 $space = ($space - $req) / $expand; # remaining space to give away
1437
1438 $req[$_] += $space * $children->[$_]{expand}
1273 for (0 .. $#$children) { 1439 for 0 .. $#$children;
1274 my $child = $children->[$_];
1275
1276 my $alloc_h = $h[$_];
1277 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1278 $h[$_] = $alloc_h;
1279 } 1440 }
1280 } 1441 }
1281 1442
1282 CFClient::UI::harmonize \@h; 1443 CFClient::UI::harmonize \@req;
1283 1444
1284 my $y = 0; 1445 my $pos = 0;
1285 for (0 .. $#$children) { 1446 for (0 .. $#$children) {
1286 my $child = $children->[$_];
1287 my $h = $h[$_]; 1447 my $alloc = $req[$_];
1288 $child->configure ($y, 0, $h, $w); 1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1289 1449
1290 $y += $h; 1450 $pos += $alloc;
1291 } 1451 }
1292 1452
1293 1 1453 1
1294} 1454}
1295 1455
1296############################################################################# 1456#############################################################################
1297 1457
1458package CFClient::UI::HBox;
1459
1460our @ISA = CFClient::UI::Box::;
1461
1462sub new {
1463 my $class = shift;
1464
1465 $class->SUPER::new (
1466 vertical => 0,
1467 @_,
1468 )
1469}
1470
1471#############################################################################
1472
1298package CFClient::UI::VBox; 1473package CFClient::UI::VBox;
1299 1474
1300# TODO: wrap into common Box base class
1301
1302our @ISA = CFClient::UI::Container::; 1475our @ISA = CFClient::UI::Box::;
1303 1476
1304sub size_request { 1477sub new {
1305 my ($self) = @_; 1478 my $class = shift;
1306 1479
1307 my @alloc = map [$_->size_request], @{$self->{children}}; 1480 $class->SUPER::new (
1308 1481 vertical => 1,
1309 ( 1482 @_,
1310 (List::Util::max map $_->[0], @alloc),
1311 (List::Util::sum map $_->[1], @alloc),
1312 ) 1483 )
1313}
1314
1315sub size_allocate {
1316 my ($self, $w, $h) = @_;
1317
1318 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1319
1320 my $children = $self->{children};
1321
1322 my @h = map $_->{req_h}, @$children;
1323
1324 my $req_h = List::Util::sum @h;
1325
1326 if ($req_h > $h) {
1327 # ah well, not enough space
1328 $_ *= $h / $req_h for @h;
1329 } else {
1330 my $exp = List::Util::sum map $_->{expand}, @$children;
1331 $exp ||= 1;
1332
1333 for (0 .. $#$children) {
1334 my $child = $children->[$_];
1335
1336 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1337 }
1338 }
1339
1340 CFClient::UI::harmonize \@h;
1341
1342 my $y = 0;
1343 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_];
1346 $child->configure (0, $y, $w, $h);
1347
1348 $y += $h;
1349 }
1350
1351 1
1352} 1484}
1353 1485
1354############################################################################# 1486#############################################################################
1355 1487
1356package CFClient::UI::Label; 1488package CFClient::UI::Label;
… …
1373 ellipsise => 3, # end 1505 ellipsise => 3, # end
1374 layout => (new CFClient::Layout), 1506 layout => (new CFClient::Layout),
1375 fontsize => 1, 1507 fontsize => 1,
1376 align => -1, 1508 align => -1,
1377 valign => -1, 1509 valign => -1,
1378 padding => 2, 1510 padding_x => 2,
1511 padding_y => 2,
1379 can_events => 0, 1512 can_events => 0,
1380 %arg 1513 %arg
1381 ); 1514 );
1382 1515
1383 if (exists $self->{template}) { 1516 if (exists $self->{template}) {
… …
1410 1543
1411 delete $self->{texture}; 1544 delete $self->{texture};
1412 $self->SUPER::update; 1545 $self->SUPER::update;
1413} 1546}
1414 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1415sub set_text { 1555sub set_text {
1416 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1417 1557
1418 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1419 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1420 1560
1421 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1422 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1423 1563
1564 delete $self->{req_h};
1565 $self->realloc;
1424 $self->update; 1566 $self->update;
1425 $self->check_size;
1426} 1567}
1427 1568
1428sub set_markup { 1569sub set_markup {
1429 my ($self, $markup) = @_; 1570 my ($self, $markup) = @_;
1430 1571
… …
1434 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1435 1576
1436 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1437 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1438 1579
1580 delete $self->{req_h};
1581 $self->realloc;
1439 $self->update; 1582 $self->update;
1440 $self->check_size;
1441} 1583}
1442 1584
1443sub size_request { 1585sub size_request {
1444 my ($self) = @_; 1586 my ($self) = @_;
1445 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1446 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1447 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1448 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1449 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1450 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1451 1596
1452 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1453 1598
1454 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1455 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1456 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1457 1602
1458 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1459 1604
1460 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1461 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1462 } 1607 }
1463 1608
1609 ($w, $h)
1464 ( 1610 }
1465 $w + $self->{padding} * 2,
1466 $h + $self->{padding} * 2,
1467 )
1468} 1611}
1469 1612
1470sub size_allocate { 1613sub size_allocate {
1471 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1472 1615
1616 delete $self->{ox};
1617
1473 delete $self->{texture}; 1618 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1474} 1620}
1475 1621
1476sub set_fontsize { 1622sub set_fontsize {
1477 my ($self, $fontsize) = @_; 1623 my ($self, $fontsize) = @_;
1478 1624
1479 $self->{fontsize} = $fontsize; 1625 $self->{fontsize} = $fontsize;
1480 delete $self->{texture}; 1626 delete $self->{texture};
1481 1627
1482 $self->update; 1628 $self->realloc;
1483 $self->check_size;
1484} 1629}
1485 1630
1486sub _draw { 1631sub _draw {
1487 my ($self) = @_; 1632 my ($self) = @_;
1488 1633
… …
1494 $self->{layout}->set_width ($self->{w}); 1639 $self->{layout}->set_width ($self->{w});
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1640 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1643
1499 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1644 new_from_layout CFClient::Texture $self->{layout}
1645 };
1500 1646
1647 unless (exists $self->{ox}) {
1501 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1502 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1503 : ($self->{w} - $tex->{w}) * 0.5); 1650 : ($self->{w} - $tex->{w}) * 0.5);
1504 1651
1505 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1506 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1507 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1508
1509 $tex
1510 }; 1655 };
1511 1656
1512 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1514 1658
1515 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1516 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1517 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1518 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1519 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1520 } 1666 }
1521 1667
1522 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1523} 1669}
… …
1552 1698
1553 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1554 1700
1555 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1556 1702
1557 delete $self->{texture};
1558
1559 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1560 $self->{text} = $text; 1704 $self->{text} = $text;
1561 1705
1562 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1563 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1564 1709
1565 $self->_emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1713 $self->update;
1566} 1714}
1567 1715
1568sub set_text { 1716sub set_text {
1569 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1570 1718
1571 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1572 $self->_set_text ($text); 1720 $self->_set_text ($text);
1573 $self->update;
1574 $self->check_size;
1575} 1721}
1576 1722
1577sub get_text { 1723sub get_text {
1578 $_[0]{text} 1724 $_[0]{text}
1579} 1725}
… …
1609 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1610 } elsif ($uni == 27) { 1756 } elsif ($uni == 27) {
1611 $self->_emit ('escape'); 1757 $self->_emit ('escape');
1612 } elsif ($uni) { 1758 } elsif ($uni) {
1613 substr $text, $self->{cursor}++, 0, chr $uni; 1759 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else {
1761 return 0;
1614 } 1762 }
1615 1763
1616 $self->_set_text ($text); 1764 $self->_set_text ($text);
1617 $self->update; 1765
1618 $self->check_size; 1766 $self->realloc;
1767
1768 1
1619} 1769}
1620 1770
1621sub focus_in { 1771sub focus_in {
1622 my ($self) = @_; 1772 my ($self) = @_;
1623 1773
… …
1638 utf8::encode $text; 1788 utf8::encode $text;
1639 $self->{cursor} = length substr $text, 0, $idx; 1789 $self->{cursor} = length substr $text, 0, $idx;
1640 1790
1641 $self->_set_text ($self->{text}); 1791 $self->_set_text ($self->{text});
1642 $self->update; 1792 $self->update;
1793
1794 1
1643} 1795}
1644 1796
1645sub mouse_motion { 1797sub mouse_motion {
1646 my ($self, $ev, $x, $y) = @_; 1798 my ($self, $ev, $x, $y) = @_;
1647# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800
1801 0
1648} 1802}
1649 1803
1650sub _draw { 1804sub _draw {
1651 my ($self) = @_; 1805 my ($self) = @_;
1652 1806
1653 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1654 1808
1655 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1656 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1657 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1658 } else { 1812 } else {
1659 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1660 } 1814 }
1661 1815
1662 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1664 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1665 glVertex 0 , 0; 1819 glVertex 0 , 0;
1666 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1667 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1668 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1729 } else { 1883 } else {
1730 $self->set_text ($self->{history_saveback}); 1884 $self->set_text ($self->{history_saveback});
1731 } 1885 }
1732 1886
1733 } else { 1887 } else {
1734 $self->SUPER::key_down ($ev); 1888 return $self->SUPER::key_down ($ev)
1889 }
1890
1735 } 1891 1
1736
1737} 1892}
1738 1893
1739############################################################################# 1894#############################################################################
1740 1895
1741package CFClient::UI::Button; 1896package CFClient::UI::Button;
… …
1750 1905
1751sub new { 1906sub new {
1752 my $class = shift; 1907 my $class = shift;
1753 1908
1754 $class->SUPER::new ( 1909 $class->SUPER::new (
1755 padding => 4, 1910 padding_x => 4,
1911 padding_y => 4,
1756 fg => [1, 1, 1], 1912 fg => [1, 1, 1],
1757 active_fg => [0, 0, 1], 1913 active_fg => [0, 0, 1],
1758 can_hover => 1, 1914 can_hover => 1,
1759 align => 0, 1915 align => 0,
1760 valign => 0, 1916 valign => 0,
… …
1769 my ($self, $ev, $x, $y) = @_; 1925 my ($self, $ev, $x, $y) = @_;
1770 1926
1771 $self->emit ("activate") 1927 $self->emit ("activate")
1772 if $x >= 0 && $x < $self->{w} 1928 if $x >= 0 && $x < $self->{w}
1773 && $y >= 0 && $y < $self->{h}; 1929 && $y >= 0 && $y < $self->{h};
1930
1931 1
1774} 1932}
1775 1933
1776sub _draw { 1934sub _draw {
1777 my ($self) = @_; 1935 my ($self) = @_;
1778 1936
1779 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1780
1781 if ($GRAB == $self) {
1782 $self->{fg} = $self->{active_fg};
1783 }
1784 1938
1785 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1786 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1787 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1788 1942
… …
1807 1961
1808sub new { 1962sub new {
1809 my $class = shift; 1963 my $class = shift;
1810 1964
1811 $class->SUPER::new ( 1965 $class->SUPER::new (
1812 padding => 2, 1966 padding_x => 2,
1967 padding_y => 2,
1813 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1814 active_fg => [1, 1, 0], 1969 active_fg => [1, 1, 0],
1815 bg => [0, 0, 0, 0.2], 1970 bg => [0, 0, 0, 0.2],
1816 active_bg => [1, 1, 1, 0.5], 1971 active_bg => [1, 1, 1, 0.5],
1817 state => 0, 1972 state => 0,
… …
1821} 1976}
1822 1977
1823sub size_request { 1978sub size_request {
1824 my ($self) = @_; 1979 my ($self) = @_;
1825 1980
1826 ($self->{padding} * 2 + 6) x 2 1981 (6) x 2
1827} 1982}
1828 1983
1829sub button_down { 1984sub button_down {
1830 my ($self, $ev, $x, $y) = @_; 1985 my ($self, $ev, $x, $y) = @_;
1831 1986
1832 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1833 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1834 $self->{state} = !$self->{state}; 1989 $self->{state} = !$self->{state};
1835 $self->_emit (changed => $self->{state}); 1990 $self->_emit (changed => $self->{state});
1991 } else {
1992 return 0
1993 }
1994
1836 } 1995 1
1837} 1996}
1838 1997
1839sub _draw { 1998sub _draw {
1840 my ($self) = @_; 1999 my ($self) = @_;
1841 2000
1842 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1843 2002
1844 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1845 2004
1846 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2005 my ($w, $h) = @$self{qw(w h)};
2006
2007 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1847 2008
1848 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2009 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1849 2010
1850 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2011 my $tex = $self->{state} ? $tex[1] : $tex[0];
1851 2012
… …
2006 2167
2007 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
2008 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
2009 2170
2010 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
2011 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2012 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
2013 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2014 2176
2015 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
2016 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
2116 fg => [1, 1, 1], 2278 fg => [1, 1, 1],
2117 active_fg => [0, 0, 0], 2279 active_fg => [0, 0, 0],
2118 bg => [0, 0, 0, 0.2], 2280 bg => [0, 0, 0, 0.2],
2119 active_bg => [1, 1, 1, 0.5], 2281 active_bg => [1, 1, 1, 0.5],
2120 range => [0, 0, 100, 10, 0], 2282 range => [0, 0, 100, 10, 0],
2121 req_w => $::WIDTH / 80, 2283 min_w => $::WIDTH / 80,
2122 req_h => $::WIDTH / 80, 2284 min_h => $::WIDTH / 80,
2123 vertical => 0, 2285 vertical => 0,
2124 can_hover => 1, 2286 can_hover => 1,
2125 inner_pad => 0.02, 2287 inner_pad => 0.02,
2126 @_ 2288 @_
2127 ); 2289 );
… …
2130 $self->update; 2292 $self->update;
2131 2293
2132 $self 2294 $self
2133} 2295}
2134 2296
2297sub changed { }
2298
2135sub set_range { 2299sub set_range {
2136 my ($self, $range) = @_; 2300 my ($self, $range) = @_;
2137 2301
2138 $self->{range} = $range; 2302 ($range, $self->{range}) = ($self->{range}, $range);
2139 2303
2140 $self->update; 2304 $self->update
2305 if "@$range" ne "@{$self->{range}}";
2141} 2306}
2142 2307
2143sub set_value { 2308sub set_value {
2144 my ($self, $value) = @_; 2309 my ($self, $value) = @_;
2145 2310
… …
2164} 2329}
2165 2330
2166sub size_request { 2331sub size_request {
2167 my ($self) = @_; 2332 my ($self) = @_;
2168 2333
2169 my $w = $self->{req_w}; 2334 ($self->{req_w}, $self->{req_h})
2170 my $h = $self->{req_h};
2171
2172 $self->{vertical} ? ($h, $w) : ($w, $h)
2173} 2335}
2174 2336
2175sub button_down { 2337sub button_down {
2176 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2177 2339
2178 $self->SUPER::button_down ($ev, $x, $y); 2340 $self->SUPER::button_down ($ev, $x, $y);
2179 2341
2180 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2181 2343
2182 $self->mouse_motion ($ev, $x, $y); 2344 $self->mouse_motion ($ev, $x, $y)
2183} 2345}
2184 2346
2185sub mouse_motion { 2347sub mouse_motion {
2186 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2187 2349
… …
2191 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2353 my (undef, $lo, $hi, $page) = @{$self->{range}};
2192 2354
2193 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2355 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2194 2356
2195 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2357 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2358 } else {
2359 return 0;
2360 }
2361
2196 } 2362 1
2197} 2363}
2198 2364
2199sub update { 2365sub update {
2200 my ($self) = @_; 2366 my ($self) = @_;
2201 2367
2202 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2368 delete $self->{knob_w};
2369 $self->SUPER::update;
2370}
2371
2372sub _draw {
2373 my ($self) = @_;
2374
2375 unless ($self->{knob_w}) {
2203 $self->set_value ($self->{range}[0]); 2376 $self->set_value ($self->{range}[0]);
2204 2377
2205 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2206 my $range = ($hi - $page - $lo) || 1e-100; 2379 my $range = ($hi - $page - $lo) || 1e-100;
2207 2380
… …
2213 $value = ($value - $lo) / $range; 2386 $value = ($value - $lo) / $range;
2214 $value = $value * $self->{scale} + $self->{offset}; 2387 $value = $value * $self->{scale} + $self->{offset};
2215 2388
2216 $self->{knob_x} = $value - $knob_w * 0.5; 2389 $self->{knob_x} = $value - $knob_w * 0.5;
2217 $self->{knob_w} = $knob_w; 2390 $self->{knob_w} = $knob_w;
2218 }); 2391 }
2219
2220 $self->SUPER::update;
2221}
2222
2223sub _draw {
2224 my ($self) = @_;
2225 2392
2226 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
2227 2394
2228 glScale $self->{w}, $self->{h}; 2395 glScale $self->{w}, $self->{h};
2229 2396
… …
2423 2590
2424 delete $self->{texture}; 2591 delete $self->{texture};
2425 } 2592 }
2426 2593
2427 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2428 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2429 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2430 2597
2431 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2432 2599
2433 my $y0 = $top; 2600 my $y0 = $top;
… …
2468sub _draw { 2635sub _draw {
2469 my ($self) = @_; 2636 my ($self) = @_;
2470 2637
2471 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2473 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2474 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2475 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2476 2643
2477 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2478 2645
2479} 2646}
… …
2528 2695
2529sub new { 2696sub new {
2530 my $class = shift; 2697 my $class = shift;
2531 2698
2532 my $self = $class->SUPER::new ( 2699 my $self = $class->SUPER::new (
2533 state => 0, 2700 state => 0,
2534 connect_activate => \&toggle_flopper, 2701 on_activate => \&toggle_flopper,
2535 @_ 2702 @_
2536 ); 2703 );
2537 2704
2538 if ($self->{state}) {
2539 $self->{state} = 0;
2540 $self->toggle_flopper;
2541 }
2542
2543 $self 2705 $self
2544} 2706}
2545 2707
2546sub toggle_flopper { 2708sub toggle_flopper {
2547 my ($self) = @_; 2709 my ($self) = @_;
2548 2710
2549 # TODO: use animation 2711 $self->{other}->toggle_visibility;
2550 if ($self->{state} = !$self->{state}) {
2551 $CFClient::UI::ROOT->add ($self->{other});
2552 $self->{other}->move ($self->coord2global (0, $self->{h}));
2553 $self->_emit ("open");
2554 } else {
2555 $CFClient::UI::ROOT->remove ($self->{other});
2556 $self->_emit ("close");
2557 }
2558
2559 $self->_emit (changed => $self->{state});
2560} 2712}
2561 2713
2562############################################################################# 2714#############################################################################
2563 2715
2564package CFClient::UI::Tooltip; 2716package CFClient::UI::Tooltip;
… …
2577} 2729}
2578 2730
2579sub set_tooltip_from { 2731sub set_tooltip_from {
2580 my ($self, $widget) = @_; 2732 my ($self, $widget) = @_;
2581 2733
2734 my $tooltip = $widget->{tooltip};
2735
2736 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}";
2741 }
2742
2582 $self->add (new CFClient::UI::Label 2743 $self->add (new CFClient::UI::Label
2583 markup => $widget->{tooltip}, 2744 markup => $tooltip,
2584 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2585 fontsize => 0.8, 2746 fontsize => 0.8,
2586 fg => [0, 0, 0, 1], 2747 fg => [0, 0, 0, 1],
2587 ellipsise => 0, 2748 ellipsise => 0,
2588 font => ($widget->{tooltip_font} || $::FONT_PROP), 2749 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2599 2760
2600sub size_allocate { 2761sub size_allocate {
2601 my ($self, $w, $h) = @_; 2762 my ($self, $w, $h) = @_;
2602 2763
2603 $self->SUPER::size_allocate ($w - 4, $h - 4); 2764 $self->SUPER::size_allocate ($w - 4, $h - 4);
2765}
2766
2767sub visibility_change {
2768 my ($self, $visible) = @_;
2769
2770 return unless $visible;
2771
2772 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner}
2774 or return;
2775
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH;
2780
2781 $self->move_abs ($x, $y);
2782 });
2604} 2783}
2605 2784
2606sub _draw { 2785sub _draw {
2607 my ($self) = @_; 2786 my ($self) = @_;
2608 2787
… …
2625 glVertex $w, $h; 2804 glVertex $w, $h;
2626 glVertex $w, 0; 2805 glVertex $w, 0;
2627 glEnd; 2806 glEnd;
2628 2807
2629 glTranslate 2 - 0.375, 2 - 0.375; 2808 glTranslate 2 - 0.375, 2 - 0.375;
2809
2630 $self->SUPER::_draw; 2810 $self->SUPER::_draw;
2631} 2811}
2632 2812
2633############################################################################# 2813#############################################################################
2634 2814
… …
2693 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2694 2874
2695 if ($tex) { 2875 if ($tex) {
2696 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2698 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2699 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2700 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2701 } 2881 }
2702} 2882}
2703 2883
… …
2710 $self->SUPER::DESTROY; 2890 $self->SUPER::DESTROY;
2711} 2891}
2712 2892
2713############################################################################# 2893#############################################################################
2714 2894
2715package CFClient::UI::Inventory; 2895package CFClient::UI::Buttonbar;
2716 2896
2717our @ISA = CFClient::UI::ScrolledWindow::; 2897our @ISA = CFClient::UI::HBox::;
2718 2898
2719sub new { 2899# TODO: should actualyl wrap buttons and other goodies.
2720 my $class = shift;
2721
2722 my $self = $class->SUPER::new (
2723 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2724 @_,
2725 );
2726
2727 $self
2728}
2729
2730sub set_items {
2731 my ($self, $items) = @_;
2732
2733 $self->{scrolled}->clear;
2734 return unless $items;
2735
2736 my @items = sort {
2737 ($a->{type} <=> $b->{type})
2738 or ($a->{name} cmp $b->{name})
2739 } @$items;
2740
2741 $self->{real_items} = \@items;
2742
2743 my $row = 0;
2744 for my $item (@items) {
2745 CFClient::Item::update_widgets $item;
2746
2747 $self->{scrolled}->add (0, $row, $item->{face_widget});
2748 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2749 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2750
2751 $row++;
2752 }
2753
2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2755}
2756
2757sub size_request {
2758 my ($self) = @_;
2759 ($self->{req_w}, $self->{req_h});
2760}
2761 2900
2762############################################################################# 2901#############################################################################
2763 2902
2764package CFClient::UI::Menu; 2903package CFClient::UI::Menu;
2765 2904
… …
2806 # maybe save $GRAB? must be careful about events... 2945 # maybe save $GRAB? must be careful about events...
2807 $GRAB = $self; 2946 $GRAB = $self;
2808 $self->{button} = $ev->{button}; 2947 $self->{button} = $ev->{button};
2809 2948
2810 $self->show; 2949 $self->show;
2811 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2812} 2951}
2813 2952
2814sub mouse_motion { 2953sub mouse_motion {
2815 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2816 2955
2817 # TODO: should use vbox->find_widget or so 2956 # TODO: should use vbox->find_widget or so
2818 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2819 $self->{hover} = $self->{item}{$HOVER}; 2958 $self->{hover} = $self->{item}{$HOVER};
2959
2960 0
2820} 2961}
2821 2962
2822sub button_up { 2963sub button_up {
2823 my ($self, $ev, $x, $y) = @_; 2964 my ($self, $ev, $x, $y) = @_;
2824 2965
… …
2826 undef $GRAB; 2967 undef $GRAB;
2827 $self->hide; 2968 $self->hide;
2828 2969
2829 $self->_emit ("popdown"); 2970 $self->_emit ("popdown");
2830 $self->{hover}[1]->() if $self->{hover}; 2971 $self->{hover}[1]->() if $self->{hover};
2972 } else {
2973 return 0
2974 }
2975
2831 } 2976 1
2832} 2977}
2833 2978
2834############################################################################# 2979#############################################################################
2835 2980
2836package CFClient::UI::Statusbox; 2981package CFClient::UI::Multiplexer;
2837 2982
2838our @ISA = CFClient::UI::VBox::; 2983our @ISA = CFClient::UI::Container::;
2839 2984
2840sub new { 2985sub new {
2841 my $class = shift; 2986 my $class = shift;
2842 2987
2843 $class->SUPER::new ( 2988 my $self = $class->SUPER::new (
2989 @_,
2990 );
2991
2992 $self->{current} = $self->{children}[0]
2993 if @{ $self->{children} };
2994
2995 $self
2996}
2997
2998sub add {
2999 my ($self, @widgets) = @_;
3000
3001 $self->SUPER::add (@widgets);
3002
3003 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} };
3005}
3006
3007sub set_current_page {
3008 my ($self, $page_or_widget) = @_;
3009
3010 my $widget = ref $page_or_widget
3011 ? $page_or_widget
3012 : $self->{children}[$page_or_widget];
3013
3014 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016
3017 $self->_emit (page_changed => $self->{current});
3018
3019 $self->realloc;
3020}
3021
3022sub visible_children {
3023 $_[0]{current}
3024}
3025
3026sub size_request {
3027 my ($self) = @_;
3028
3029 $self->{current}->size_request
3030}
3031
3032sub size_allocate {
3033 my ($self, $w, $h) = @_;
3034
3035 $self->{current}->configure (0, 0, $w, $h);
3036}
3037
3038sub _draw {
3039 my ($self) = @_;
3040
3041 $self->{current}->draw;
3042}
3043
3044#############################################################################
3045
3046package CFClient::UI::Notebook;
3047
3048our @ISA = CFClient::UI::VBox::;
3049
3050sub new {
3051 my $class = shift;
3052
3053 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self
3057 @_,
3058 );
3059
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3061 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3062
3063 $self
3064}
3065
3066sub add {
3067 my ($self, $title, $widget, $tooltip) = @_;
3068
3069 Scalar::Util::weaken $self;
3070
3071 $self->{buttonbar}->add (new CFClient::UI::Button
3072 markup => $title,
3073 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) },
3075 );
3076
3077 $self->{multiplexer}->add ($widget);
3078}
3079
3080sub set_current_page {
3081 my ($self, $page) = @_;
3082
3083 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current});
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::Statusbox;
3090
3091our @ISA = CFClient::UI::VBox::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (
2844 fontsize => 0.8, 3097 fontsize => 0.8,
2845 @_, 3098 @_,
2846 ) 3099 );
3100
3101 Scalar::Util::weaken (my $this = $self);
3102
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104
3105 $self
2847} 3106}
2848 3107
2849sub reorder { 3108sub reorder {
2850 my ($self) = @_; 3109 my ($self) = @_;
2851 my $NOW = time; 3110 my $NOW = Time::HiRes::time;
3111
3112 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} };
2852 3116
2853 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
2854 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2855 } 3119 }
2856 3120
… …
2859 my @items = sort { 3123 my @items = sort {
2860 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
2861 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
2862 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
2863 3127
3128 $self->{timer}->interval (1);
3129
2864 my $count = 10 + 1; 3130 my $count = 10 + 1;
2865 for my $item (@items) { 3131 for my $item (@items) {
2866 last unless --$count; 3132 last unless --$count;
2867 3133
2868 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
2869 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
2870 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
2871 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
2872 : $item->{text}; 3138 : $item->{text};
2873 3139
… …
2881 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
2882 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
2883 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
2884 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
2885 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
2886 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
2887 can_events => 1, 3153 can_events => 1,
2888 can_hover => 1 3154 can_hover => 1
2889 }; 3155 };
3156
3157 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3158 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3159 $label->update;
3160 $label->set_max_size (undef, $label->{req_h} * $diff)
3161 if $diff < 1;
3162 $self->{timer}->interval (1/30);
3163 } else {
3164 $label->{fg}[3] = $item->{fg}[3] || 1;
3165 }
3166
3167 push @widgets, $label;
2890 } 3168 }
2891 3169
2892 $self->clear; 3170 $self->clear;
2893 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
2894} 3172}
… …
2899 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
2900 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
2901 3179
2902 return unless $text; 3180 return unless $text;
2903 3181
2904 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2905 3183
2906 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2907 3185
2908 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
2909 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
2939 3217
2940 $self->reorder; 3218 $self->reorder;
2941 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
2942} 3220}
2943 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
2944############################################################################# 3230#############################################################################
2945 3231
2946package CFClient::UI::Root; 3232package CFClient::UI::Inventory;
2947 3233
2948our @ISA = CFClient::UI::Container::; 3234our @ISA = CFClient::UI::ScrolledWindow::;
2949
2950use CFClient::OpenGL;
2951 3235
2952sub new { 3236sub new {
2953 my $class = shift; 3237 my $class = shift;
2954 3238
2955 $class->SUPER::new ( 3239 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3241 @_,
3242 );
3243
3244 $self
3245}
3246
3247sub set_items {
3248 my ($self, $items) = @_;
3249
3250 $self->{child}->clear;
3251 return unless $items;
3252
3253 my @items = sort {
3254 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name})
3256 } @$items;
3257
3258 $self->{real_items} = \@items;
3259
3260 my $row = 0;
3261 for my $item (@items) {
3262 CFClient::Item::update_widgets $item;
3263
3264 $self->{child}->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget});
3267
3268 $row++;
3269 }
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 }
3467}
3468
3469#############################################################################
3470
3471package CFClient::UI::SpellList;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 binding => [],
3480 commands => [],
2956 @_, 3481 @_,
2957 ) 3482 )
2958} 3483}
2959 3484
2960sub configure { 3485# XXX: Do sorting? Argl...
2961 my ($self, $x, $y, $w, $h) = @_; 3486sub add_spell {
2962
2963 $self->{w} = $w;
2964 $self->{h} = $h;
2965}
2966
2967sub check_size {
2968 my ($self) = @_; 3487 my ($self, $spell) = @_;
3488 $self->{spells}->{$spell->{name}} = $spell;
2969 3489
2970 $self->size_allocate ($self->{w}, $self->{h}) 3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2971 if $self->{w}; 3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517}
3518
3519sub remove_spell {
3520 my ($self, $spell) = @_;
3521 delete $self->{spells}->{$spell->{name}};
3522 $self->rebuild_spell_list;
3523}
3524
3525#############################################################################
3526
3527package CFClient::UI::Root;
3528
3529our @ISA = CFClient::UI::Container::;
3530
3531use List::Util qw(min max);
3532
3533use CFClient::OpenGL;
3534
3535sub new {
3536 my $class = shift;
3537
3538 my $self = $class->SUPER::new (
3539 visible => 1,
3540 @_,
3541 );
3542
3543 Scalar::Util::weaken ($self->{root} = $self);
3544
3545 $self
2972} 3546}
2973 3547
2974sub size_request { 3548sub size_request {
2975 my ($self) = @_; 3549 my ($self) = @_;
2976 3550
2977 ($self->{w}, $self->{h}) 3551 ($self->{w}, $self->{h})
3552}
3553
3554sub _to_pixel {
3555 my ($coord, $size, $max) = @_;
3556
3557 $coord =
3558 $coord eq "center" ? ($max - $size) * 0.5
3559 : $coord eq "max" ? $max
3560 : $coord;
3561
3562 $coord = 0 if $coord < 0;
3563 $coord = $max - $size if $coord > $max - $size;
3564
3565 int $coord + 0.5
2978} 3566}
2979 3567
2980sub size_allocate { 3568sub size_allocate {
2981 my ($self, $w, $h) = @_; 3569 my ($self, $w, $h) = @_;
2982 3570
2983 for my $child ($self->children) { 3571 for my $child ($self->children) {
2984 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2985 3573
2986 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3574 $X = $child->{force_x} if exists $child->{force_x};
2987 if exists $child->{req_x}; 3575 $Y = $child->{force_y} if exists $child->{force_y};
2988 3576
2989 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3577 $X = _to_pixel $X, $W, $self->{w};
2990 if exists $child->{req_y}; 3578 $Y = _to_pixel $Y, $H, $self->{h};
2991
2992 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2993 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2994 3579
2995 $child->configure ($X, $Y, $W, $H); 3580 $child->configure ($X, $Y, $W, $H);
2996 } 3581 }
2997} 3582}
2998 3583
… …
3009} 3594}
3010 3595
3011sub update { 3596sub update {
3012 my ($self) = @_; 3597 my ($self) = @_;
3013 3598
3014 $self->check_size;
3015 $::WANT_REFRESH++; 3599 $::WANT_REFRESH++;
3016} 3600}
3017 3601
3018sub add { 3602sub add {
3019 my ($self, @children) = @_; 3603 my ($self, @children) = @_;
3020 3604
3021 for (my @widgets = @children; my $w = pop @widgets; ) {
3022 push @widgets, $w->children;
3023 $w->{root} = $self;
3024 $w->{visible} = 1;
3025 }
3026
3027 for my $child (@children) {
3028 $child->{is_toplevel} = 1; 3605 $_->{is_toplevel} = 1
3029 3606 for @children;
3030 # integerise window positions
3031 $child->{x} = int $child->{x};
3032 $child->{y} = int $child->{y};
3033 }
3034 3607
3035 $self->SUPER::add (@children); 3608 $self->SUPER::add (@children);
3036} 3609}
3037 3610
3038sub remove { 3611sub remove {
3039 my ($self, @children) = @_; 3612 my ($self, @children) = @_;
3040 3613
3041 $self->SUPER::remove (@children); 3614 $self->SUPER::remove (@children);
3615
3616 delete $self->{is_toplevel}
3617 for @children;
3042 3618
3043 while (@children) { 3619 while (@children) {
3044 my $w = pop @children; 3620 my $w = pop @children;
3045 push @children, $w->children; 3621 push @children, $w->children;
3046 $w->set_invisible; 3622 $w->set_invisible;
… …
3065 while ($self->{refresh_hook}) { 3641 while ($self->{refresh_hook}) {
3066 $_->() 3642 $_->()
3067 for values %{delete $self->{refresh_hook}}; 3643 for values %{delete $self->{refresh_hook}};
3068 } 3644 }
3069 3645
3070 if ($self->{check_size}) { 3646 if ($self->{realloc}) {
3071 my @queue = ([], []); 3647 my %queue;
3648 my @queue;
3649 my $widget;
3072 3650
3073 for (;;) { 3651 outer:
3074 if ($self->{check_size}) { 3652 while () {
3075 # heuristic: check containers last 3653 if (my $realloc = delete $self->{realloc}) {
3076 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3654 for $widget (values %$realloc) {
3077 for values %{delete $self->{check_size}} 3655 $widget->{visible} or next; # do not resize invisible widgets
3656
3657 $queue{$widget+0}++ and next; # duplicates are common
3658
3659 push @{ $queue[$widget->{visible}] }, $widget;
3660 }
3078 } 3661 }
3079 3662
3080 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3663 while () {
3664 @queue or last outer;
3081 3665
3082 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3666 $widget = pop @{ $queue[-1] || [] }
3083 ? @$widget{qw(user_w user_h)} 3667 and last;
3084 : $widget->size_request;
3085
3086 if (delete $widget->{force_alloc}
3087 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3088 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3089 3668
3669 pop @queue;
3670 }
3671
3672 delete $queue{$widget+0};
3673
3674 my ($w, $h) = $widget->size_request;
3675
3676 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3677 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3678
3679 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3680 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3681
3682 $w = $widget->{force_w} if exists $widget->{force_w};
3683 $h = $widget->{force_h} if exists $widget->{force_h};
3684
3685 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3686 || delete $widget->{force_realloc}) {
3090 $widget->{req_w} = $w; 3687 $widget->{req_w} = $w;
3091 $widget->{req_h} = $h; 3688 $widget->{req_h} = $h;
3092 3689
3093 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3690 $self->{size_alloc}{$widget+0} = $widget;
3094 3691
3095 $widget->{parent}->check_size
3096 if $widget->{parent}; 3692 if (my $parent = $widget->{parent}) {
3693 $self->{realloc}{$parent+0} = $parent
3694 unless $queue{$parent+0};
3695
3696 $parent->{force_size_alloc} = 1;
3697 $self->{size_alloc}{$parent+0} = $parent;
3698 }
3097 } 3699 }
3700
3701 delete $self->{realloc}{$widget+0};
3098 } 3702 }
3099 } 3703 }
3100 3704
3101 while ($self->{size_alloc}) { 3705 while (my $size_alloc = delete $self->{size_alloc}) {
3102 for (values %{delete $self->{size_alloc}}) { 3706 my @queue = sort { $b->{visible} <=> $a->{visible} }
3103 my ($widget, $w, $h) = @$_; 3707 values %$size_alloc;
3708
3709 while () {
3710 my $widget = pop @queue || last;
3711
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3104 3713
3105 $w = 0 if $w < 0; 3714 $w = 0 if $w < 0;
3106 $h = 0 if $h < 0; 3715 $h = 0 if $h < 0;
3107 3716
3717 $w = int $w + 0.5;
3718 $h = int $h + 0.5;
3719
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w};
3722 $widget->{old_h} = $widget->{h};
3723
3108 $widget->{w} = $w; 3724 $widget->{w} = $w;
3109 $widget->{h} = $h; 3725 $widget->{h} = $h;
3726
3110 $widget->emit (size_allocate => $w, $h); 3727 $widget->emit (size_allocate => $w, $h);
3728 }
3111 } 3729 }
3112 } 3730 }
3113 3731
3114 while ($self->{post_alloc_hook}) { 3732 while ($self->{post_alloc_hook}) {
3115 $_->() 3733 $_->()
3116 for values %{delete $self->{post_alloc_hook}}; 3734 for values %{delete $self->{post_alloc_hook}};
3117 } 3735 }
3736
3118 3737
3119 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3738 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3120 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3121 glClear GL_COLOR_BUFFER_BIT; 3740 glClear GL_COLOR_BUFFER_BIT;
3122 3741
… …
3124 glLoadIdentity; 3743 glLoadIdentity;
3125 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3126 glMatrixMode GL_MODELVIEW; 3745 glMatrixMode GL_MODELVIEW;
3127 glLoadIdentity; 3746 glLoadIdentity;
3128 3747
3748 {
3749 package CFClient::UI::Base;
3750
3751 ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h});
3753 }
3754
3129 $self->_draw; 3755 $self->_draw;
3130} 3756}
3131 3757
3132############################################################################# 3758#############################################################################
3133 3759

Diff Legend

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