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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 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]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
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 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
158sub rescale_widgets { 172sub rescale_widgets {
159 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
160 174
161 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
162 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
163 $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.]+$/;
164 $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};
165 $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};
166 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
167 $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.]+$/;
168 $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};
169 $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};
170 $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
171 } 190 }
172 } 191 }
173 192
174 reconfigure_widgets; 193 reconfigure_widgets;
175} 194}
… …
184 203
185sub new { 204sub new {
186 my $class = shift; 205 my $class = shift;
187 206
188 my $self = bless { 207 my $self = bless {
189 x => 0, 208 x => "center",
190 y => 0, 209 y => "center",
191 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
192 can_events => 1, 213 can_events => 1,
193 @_ 214 @_
194 }, $class; 215 }, $class;
195 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
196 for (keys %$self) { 219 for (keys %$self) {
197 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
198 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
199 } 222 }
200 } 223 }
201 224
202 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 }
203 236
204 $self 237 $self
205} 238}
206 239
207sub destroy { 240sub destroy {
… …
211 %$self = (); 244 %$self = ();
212} 245}
213 246
214sub show { 247sub show {
215 my ($self) = @_; 248 my ($self) = @_;
249
216 return if $self->{parent}; 250 return if $self->{parent};
217 251
218 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
219} 253}
220 254
221sub show_centered { 255sub set_visible {
222 my ($self) = @_; 256 my ($self) = @_;
257
223 return if $self->{parent}; 258 return if $self->{visible};
224 259
225 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
226 262
227 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
228 "centered $self" => sub {
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 },
231 );
232}
233 264
234sub hide { 265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
235 my ($self) = @_; 271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
278 delete $self->{visible};
236 279
237 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
239 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
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;
306}
307
308sub hide {
309 my ($self) = @_;
310
311 $self->set_invisible;
312
240 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
241 if $self->{parent}; 314 if $self->{parent};
242} 315}
243 316
244sub move { 317sub move_abs {
245 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
246 319
247 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
248 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
249 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
250 323
251 $self->update; 324 $self->update;
252} 325}
253 326
254sub set_size { 327sub set_size {
255 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
256 329
257 $self->{user_w} = $w; 330 $self->{force_w} = $w;
258 $self->{user_h} = $h; 331 $self->{force_h} = $h;
259 332
260 $self->check_size; 333 $self->realloc;
261} 334}
262 335
263sub size_request { 336sub size_request {
264 require Carp; 337 require Carp;
265 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
267 340
268sub configure { 341sub configure {
269 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
270 343
271 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
272 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
273 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
274 349
275 # use alignment to adjust x, y 350 # use alignment to adjust x, y
276 351
277 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
278 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
279
280 ($w, $h) = ($w2, $h2);
281 } 354 }
282 355
283 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
284 $self->{x} = $x; 357 $self->{x} = $x;
285 $self->{y} = $y; 358 $self->{y} = $y;
286 $self->update; 359 $self->update;
287 } 360 }
288 361
289 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
290 $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;
291 } 369 }
292} 370}
293 371
294sub size_allocate { 372sub size_allocate {
295 # nothing to be done 373 # nothing to be done
296} 374}
297 375
298sub reconfigure {
299 my ($self) = @_;
300
301 $self->check_size (1);
302 $self->update;
303}
304
305sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
306} 382}
307 383
308sub set_max_size { 384sub set_max_size {
309 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
310 386
311 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
312 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
313} 391}
314 392
315sub set_tooltip { 393sub set_tooltip {
316 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
317 395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
318 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
319 402
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
322 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
323 } 406 }
324} 407}
325 408
326# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
327sub coord2local { 410sub coord2local {
… …
343 return if $FOCUS == $self; 426 return if $FOCUS == $self;
344 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
345 428
346 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
347 430
348 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
349 432
350 $focus->update if $focus; 433 $focus->update if $focus;
351 $FOCUS->update; 434 $FOCUS->update;
352} 435}
353 436
… …
356 439
357 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
358 441
359 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
360 443
361 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
362 445
363 $focus->update if $focus; #? 446 $focus->update if $focus; #?
364}
365 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
366sub mouse_motion { } 452sub mouse_motion { 0 }
367sub button_up { } 453sub button_up { 0 }
368sub key_down { } 454sub key_down { 0 }
369sub key_up { } 455sub key_up { 0 }
370 456
371sub button_down { 457sub button_down {
372 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
373 459
374 $self->focus_in; 460 $self->focus_in;
375}
376 461
377sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
378sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
379sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
380sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
381sub 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
382 538
383sub draw { 539sub draw {
384 my ($self) = @_; 540 my ($self) = @_;
385 541
386 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);
387 553
388 glPushMatrix; 554 glPushMatrix;
389 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
390 $self->_draw;
391 glPopMatrix;
392 556
393 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
394 my ($x, $y) = @$self{qw(x y)};
395
396 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
397 glEnable GL_BLEND; 559 glEnable GL_BLEND;
398 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
399 glBegin GL_QUADS; 561 glBegin GL_QUADS;
400 glVertex $x , $y;
401 glVertex $x + $self->{w}, $y;
402 glVertex $x + $self->{w}, $y + $self->{h};
403 glVertex $x , $y + $self->{h};
404 glEnd;
405 glDisable GL_BLEND;
406 }
407
408 if ($ENV{PCLIENT_DEBUG}) {
409 glPushMatrix;
410 glColor 1, 1, 0, 1;
411 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
412 glBegin GL_LINE_LOOP;
413 glVertex 0 , 0; 562 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
415 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
416 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
417 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
418 glPopMatrix; 580 glPopMatrix;
419 #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;
420 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
421} 586}
422 587
423sub _draw { 588sub _draw {
424 my ($self) = @_; 589 my ($self) = @_;
425 590
426 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
427}
428
429sub find_widget {
430 my ($self, $x, $y) = @_;
431
432 return () unless $self->{can_events};
433
434 return $self
435 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
436 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
437
438 ()
439}
440
441sub set_parent {
442 my ($self, $parent) = @_;
443
444 Scalar::Util::weaken ($self->{parent} = $parent);
445
446 # TODO: req_w _does_change after ->reconfigure
447 $self->check_size
448 unless exists $self->{req_w};
449
450 $self->show;
451}
452
453sub check_size {
454 my ($self, $forced) = @_;
455
456 $self->{force_alloc} = 1 if $forced;
457 $CFClient::UI::ROOT->{check_size}{$self} = $self;
458}
459
460sub update {
461 my ($self) = @_;
462
463 $self->{parent}->update
464 if $self->{parent};
465}
466
467sub connect {
468 my ($self, $signal, $cb) = @_;
469
470 push @{ $self->{signal_cb}{$signal} }, $cb;
471}
472
473sub emit {
474 my ($self, $signal, @args) = @_;
475
476 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
477} 592}
478 593
479sub DESTROY { 594sub DESTROY {
480 my ($self) = @_; 595 my ($self) = @_;
481 596
… …
513 628
514 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
515 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
516 631
517 glEnable GL_BLEND; 632 glEnable GL_BLEND;
518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
519 glColor @$color; 634 glColor_premultiply @$color;
520 635
521 glBegin GL_QUADS; 636 glBegin GL_QUADS;
522 glVertex 0 , 0; 637 glVertex 0 , 0;
523 glVertex 0 , $h; 638 glVertex 0 , $h;
524 glVertex $w, $h; 639 glVertex $w, $h;
… …
539 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
540 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
541} 656}
542 657
543sub size_request { 658sub size_request {
544 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
545} 662}
546 663
547sub draw { } 664sub draw { }
548 665
549############################################################################# 666#############################################################################
… …
553our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
554 671
555sub new { 672sub new {
556 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
557 674
558 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
559 676
560 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
561 children => [], 678 children => [],
562 can_events => 0, 679 can_events => 0,
563 %arg, 680 %arg,
564 ); 681 );
682
565 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
566 685
567 $self 686 $self
568} 687}
569 688
570sub add { 689sub add {
… …
578 $self->{children} = [ 697 $self->{children} = [
579 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
580 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
581 ]; 700 ];
582 701
583 $self->check_size (1); 702 $self->realloc;
584 $self->update;
585} 703}
586 704
587sub children { 705sub children {
588 @{ $_[0]{children} } 706 @{ $_[0]{children} }
589} 707}
… …
594 delete $child->{parent}; 712 delete $child->{parent};
595 $child->hide; 713 $child->hide;
596 714
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 716
599 $self->check_size; 717 $self->realloc;
600 $self->update;
601} 718}
602 719
603sub clear { 720sub clear {
604 my ($self) = @_; 721 my ($self) = @_;
605 722
… …
609 for (@$children) { 726 for (@$children) {
610 delete $_->{parent}; 727 delete $_->{parent};
611 $_->hide; 728 $_->hide;
612 } 729 }
613 730
614 $self->check_size; 731 $self->realloc;
615 $self->update;
616} 732}
617 733
618sub find_widget { 734sub find_widget {
619 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
620 736
621 $x -= $self->{x}; 737 $x -= $self->{x};
622 $y -= $self->{y}; 738 $y -= $self->{y};
623 739
624 my $res; 740 my $res;
625 741
626 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
627 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
628 and return $res; 744 and return $res;
629 } 745 }
630 746
631 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
680 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
681} 797}
682 798
683############################################################################# 799#############################################################################
684 800
801# back-buffered drawing area
802
685package CFClient::UI::Window; 803package CFClient::UI::Window;
686 804
687our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
688 806
689use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
707 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
708 $self->update; 826 $self->update;
709} 827}
710 828
711sub _render { 829sub _render {
830 my ($self) = @_;
831
712 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
713} 833}
714 834
715sub render_child { 835sub render_child {
716 my ($self) = @_; 836 my ($self) = @_;
717 837
718 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
719 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
720 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
721 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
722 $self->_render; 849 $self->_render;
723 }; 850 };
724} 851}
725 852
726sub _draw { 853sub _draw {
727 my ($self) = @_; 854 my ($self) = @_;
728 855
729 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
730 857
731 my $tex = $self->{texture} 858 my $tex = $self->{texture}
732 or return; 859 or return;
733 860
734 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
736 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
737 864
738 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
739 866
740 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
741} 868}
… …
744 871
745package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
746 873
747our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
748 875
876sub new {
877 my $class = shift;
878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
749sub size_request { 886sub size_request {
750 my ($self) = @_; 887 my ($self) = @_;
751 888
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
753 890
754 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
755} 895}
756 896
757sub size_allocate { 897sub size_allocate {
758 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
759 899
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 900 my $child = $self->child;
761# $w = $self->{w}; 901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
762 $self->child->configure (0, 0, $cw, $ch); 905 $self->child->configure (0, 0, $w, $h);
763 $self->update; 906 $self->update;
764} 907}
765 908
766sub set_offset { 909sub set_offset {
767 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
801} 944}
802 945
803sub _render { 946sub _render {
804 my ($self) = @_; 947 my ($self) = @_;
805 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
806 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
807 953
808 $self->SUPER::_render; 954 $self->SUPER::_render;
809} 955}
810 956
… …
813package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
814 960
815our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
816 962
817sub new { 963sub new {
818 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
819 967
820 my $self; 968 my $self;
821 969
822 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
823 vertical => 1, 971 vertical => 1,
824 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
825 connect_changed => sub { 973 on_changed => sub {
826 $self->{vp}->set_offset (0, $_[1]); 974 $self->{vp}->set_offset (0, $_[1]);
827 }, 975 },
828 ; 976 ;
829 977
830 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
831 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
832 slider => $slider, 980 slider => $slider,
833 @_, 981 %arg,
834 ); 982 );
835 983
836 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
839 986
840 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
841} 1004}
842 1005
843sub size_allocate { 1006sub size_allocate {
844 my ($self, $w, $h) = @_; 1007 my ($self, $w, $h) = @_;
845 1008
… …
874 1037
875 if ($self->{bg}) { 1038 if ($self->{bg}) {
876 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
877 1040
878 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
879 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
880 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
881 1044
882 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
883 glVertex 0 , 0; 1046 glVertex 0 , 0;
884 glVertex 0 , $h; 1047 glVertex 0 , $h;
885 glVertex $w, $h; 1048 glVertex $w, $h;
… …
898 1061
899our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
900 1063
901use CFClient::OpenGL; 1064use CFClient::OpenGL;
902 1065
903my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
905 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
906 1073
907sub new { 1074sub new {
908 my $class = shift; 1075 my ($class, %arg) = @_;
909 1076
910 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
911 1078
912 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
913 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
914 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
915 border => 0.6, 1082 border => 0.6,
916 is_toplevel => 1,
917 can_events => 1, 1083 can_events => 1,
918 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
919 ); 1087 );
920 1088
921 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
922 align => 0, 1090 align => 0,
923 valign => 1, 1091 valign => 1,
924 text => $self->{title}, 1092 text => $title,
925 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
926 1095
927 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
928} 1104}
929 1105
930sub border { 1106sub border {
931 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
932} 1108}
933 1109
934sub size_request { 1110sub size_request {
935 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
936 1115
937 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
938 1117
939 ( 1118 (
940 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
943} 1122}
944 1123
945sub size_allocate { 1124sub size_allocate {
946 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
947 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
948 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
949 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
950 1137
951 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
952 if $self->{title};
953
954 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
955} 1139}
956 1140
957sub button_down { 1141sub button_down {
958 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
959 1143
… …
975 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
976 1160
977 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
979 1163
980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
983 $self->check_size; 1168 $self->realloc;
984 }; 1169 };
985 1170
986 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
987 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
988 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
990 $self->{motion} = sub { 1175 $self->{motion} = sub {
991 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
992 1177
993 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
994 1179
995 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
996 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
997 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
998 } 1188 1
999} 1189}
1000 1190
1001sub button_up { 1191sub button_up {
1002 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1003 1193
1004 delete $self->{motion}; 1194 !!delete $self->{motion}
1005} 1195}
1006 1196
1007sub mouse_motion { 1197sub mouse_motion {
1008 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1009 1199
1010 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1011} 1203}
1012 1204
1013sub _draw { 1205sub _draw {
1014 my ($self) = @_; 1206 my ($self) = @_;
1015 1207
1208 my $child = $self->{children}[0];
1209
1016 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1017 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1018 1212
1019 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1021 1215
1022 my $border = $self->border; 1216 my $border = $self->border;
1023 1217
1024 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1025 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1026 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1027 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1028 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1029 1223
1030 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1031 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1032 1226
1033 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1034 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1035 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1036
1037 glColor @{ $self->{bg} };
1038
1039 $bg->{s} = $rep_x;
1040 $bg->{t} = $rep_y;
1041 $bg->{wrap_mode} = 1;
1042 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1043 } 1232 }
1044 1233
1045 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1046 1235
1047 $self->{title}->draw if $self->{title};
1048
1049 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1050} 1242}
1051 1243
1052############################################################################# 1244#############################################################################
1053 1245
1054package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1062sub new { 1254sub new {
1063 my $class = shift; 1255 my $class = shift;
1064 1256
1065 $class->SUPER::new ( 1257 $class->SUPER::new (
1066 col_expand => [], 1258 col_expand => [],
1067 @_ 1259 @_,
1068 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1265}
1070 1266
1071sub add { 1267sub add {
1072 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1073 1269
1074 $child->set_parent ($self); 1270 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1076 1272
1077 $child->check_size; 1273 $self->realloc;
1078} 1274}
1079 1275
1080sub children {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1082}
1083
1084# TODO: move to container class maybe? send childs a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1277sub clear {
1086 my ($self) = @_; 1278 my ($self) = @_;
1087 1279
1088 my @children = $self->children; 1280 my @children = $self->children;
1089 delete $self->{children}; 1281 delete $self->{children};
… …
1091 for (@children) { 1283 for (@children) {
1092 delete $_->{parent}; 1284 delete $_->{parent};
1093 $_->hide; 1285 $_->hide;
1094 } 1286 }
1095 1287
1096 $self->update; 1288 $self->realloc;
1097} 1289}
1098 1290
1099sub get_wh { 1291sub get_wh {
1100 my ($self) = @_; 1292 my ($self) = @_;
1101 1293
… …
1132sub size_allocate { 1324sub size_allocate {
1133 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1134 1326
1135 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1136 1328
1137 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1139 1331
1140 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1197 } 1389 }
1198} 1390}
1199 1391
1200############################################################################# 1392#############################################################################
1201 1393
1202package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1203
1204# TODO: wrap into common Box base class
1205 1395
1206our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1207 1397
1208sub size_request { 1398sub size_request {
1209 my ($self) = @_; 1399 my ($self) = @_;
1210 1400
1211 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1212 1402 ? (
1213 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1214 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1215 (List::Util::max map $_->[1], @alloc), 1405 )
1216 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1217} 1410}
1218 1411
1219sub size_allocate { 1412sub size_allocate {
1220 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1221 1414
1222 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1223
1224 my $children = $self->{children}; 1416 my $children = $self->{children};
1225 1417
1226 my @h = map $_->{req_w}, @$children; 1418 my @req;
1227 1419
1228 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1229 1421 @req = ($space / (@$children || 1)) x @$children;
1230 if ($req_h > $h) {
1231 # ah well, not enough space
1232 $_ *= $h / $req_h for @h;
1233 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1234 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1235 $exp ||= 1;
1236 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1237 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1238 my $child = $children->[$_];
1239
1240 my $alloc_h = $h[$_];
1241 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1242 $h[$_] = $alloc_h;
1243 } 1436 }
1244 } 1437 }
1245 1438
1246 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1247 1440
1248 my $y = 0; 1441 my $pos = 0;
1249 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1250 my $child = $children->[$_];
1251 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1252 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1253 1445
1254 $y += $h; 1446 $pos += $alloc;
1255 } 1447 }
1256 1448
1257 1 1449 1
1258} 1450}
1259 1451
1260############################################################################# 1452#############################################################################
1261 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1262package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1263 1470
1264# TODO: wrap into common Box base class
1265
1266our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1267 1472
1268sub size_request { 1473sub new {
1269 my ($self) = @_; 1474 my $class = shift;
1270 1475
1271 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1272 1477 vertical => 1,
1273 ( 1478 @_,
1274 (List::Util::max map $_->[0], @alloc),
1275 (List::Util::sum map $_->[1], @alloc),
1276 ) 1479 )
1277}
1278
1279sub size_allocate {
1280 my ($self, $w, $h) = @_;
1281
1282 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1283
1284 my $children = $self->{children};
1285
1286 my @h = map $_->{req_h}, @$children;
1287
1288 my $req_h = List::Util::sum @h;
1289
1290 if ($req_h > $h) {
1291 # ah well, not enough space
1292 $_ *= $h / $req_h for @h;
1293 } else {
1294 my $exp = List::Util::sum map $_->{expand}, @$children;
1295 $exp ||= 1;
1296
1297 for (0 .. $#$children) {
1298 my $child = $children->[$_];
1299
1300 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1301 }
1302 }
1303
1304 CFClient::UI::harmonize \@h;
1305
1306 my $y = 0;
1307 for (0 .. $#$children) {
1308 my $child = $children->[$_];
1309 my $h = $h[$_];
1310 $child->configure (0, $y, $w, $h);
1311
1312 $y += $h;
1313 }
1314
1315 1
1316} 1480}
1317 1481
1318############################################################################# 1482#############################################################################
1319 1483
1320package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1337 ellipsise => 3, # end 1501 ellipsise => 3, # end
1338 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1339 fontsize => 1, 1503 fontsize => 1,
1340 align => -1, 1504 align => -1,
1341 valign => -1, 1505 valign => -1,
1342 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1343 can_events => 0, 1508 can_events => 0,
1344 %arg 1509 %arg
1345 ); 1510 );
1346 1511
1347 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1374 1539
1375 delete $self->{texture}; 1540 delete $self->{texture};
1376 $self->SUPER::update; 1541 $self->SUPER::update;
1377} 1542}
1378 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1379sub set_text { 1551sub set_text {
1380 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1381 1553
1382 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1383 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1384 1556
1385 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1386 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1387 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1388 $self->update; 1562 $self->update;
1389 $self->check_size;
1390} 1563}
1391 1564
1392sub set_markup { 1565sub set_markup {
1393 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1394 1567
… …
1398 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1399 1572
1400 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1401 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1402 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1403 $self->update; 1578 $self->update;
1404 $self->check_size;
1405} 1579}
1406 1580
1407sub size_request { 1581sub size_request {
1408 my ($self) = @_; 1582 my ($self) = @_;
1409 1583
1584 $self->{size_req} ||= do {
1410 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1411 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1412 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1413 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1415 1590
1416 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1417 1592
1418 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1419 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1420 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1421 1596
1422 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1423 1598
1424 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1425 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1426 } 1604 };
1427 1605
1428 ( 1606 @{ $self->{size_req} }
1429 $w + $self->{padding} * 2,
1430 $h + $self->{padding} * 2,
1431 )
1432} 1607}
1433 1608
1434sub size_allocate { 1609sub size_allocate {
1435 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1436 1611
1612 delete $self->{ox};
1613
1437 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1438} 1616}
1439 1617
1440sub set_fontsize { 1618sub set_fontsize {
1441 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1442 1620
1443 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1444 delete $self->{texture}; 1622 delete $self->{texture};
1445 1623
1446 $self->update; 1624 $self->realloc;
1447 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1448} 1633}
1449 1634
1450sub _draw { 1635sub _draw {
1451 my ($self) = @_; 1636 my ($self) = @_;
1452 1637
… …
1458 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1462 1647
1463 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1464 1650
1651 unless (exists $self->{ox}) {
1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1467 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1468 1655
1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1471 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1472
1473 $tex
1474 }; 1659 };
1475 1660
1476 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1478 1662
1479 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1480 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1481 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1482 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1483 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1484 } 1670 }
1485 1671
1486 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1487} 1673}
… …
1516 1702
1517 delete $self->{cur_h}; 1703 delete $self->{cur_h};
1518 1704
1519 return if $self->{text} eq $text; 1705 return if $self->{text} eq $text;
1520 1706
1521 delete $self->{texture};
1522
1523 $self->{last_activity} = $::NOW; 1707 $self->{last_activity} = $::NOW;
1524 $self->{text} = $text; 1708 $self->{text} = $text;
1525 1709
1526 $text =~ s/./*/g if $self->{hidden}; 1710 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1711 $self->{layout}->set_text ("$text ");
1712 delete $self->{size_req};
1528 1713
1529 $self->emit (changed => $self->{text}); 1714 $self->_emit (changed => $self->{text});
1715
1716 $self->realloc;
1717 $self->update;
1530} 1718}
1531 1719
1532sub set_text { 1720sub set_text {
1533 my ($self, $text) = @_; 1721 my ($self, $text) = @_;
1534 1722
1535 $self->{cursor} = length $text; 1723 $self->{cursor} = length $text;
1536 $self->_set_text ($text); 1724 $self->_set_text ($text);
1537 $self->update;
1538 $self->check_size;
1539} 1725}
1540 1726
1541sub get_text { 1727sub get_text {
1542 $_[0]{text} 1728 $_[0]{text}
1543} 1729}
… …
1546 my ($self) = @_; 1732 my ($self) = @_;
1547 1733
1548 my ($w, $h) = $self->SUPER::size_request; 1734 my ($w, $h) = $self->SUPER::size_request;
1549 1735
1550 ($w + 1, $h) # add 1 for cursor 1736 ($w + 1, $h) # add 1 for cursor
1551}
1552
1553sub size_allocate {
1554 my ($self, $w, $h) = @_;
1555
1556 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1557} 1737}
1558 1738
1559sub key_down { 1739sub key_down {
1560 my ($self, $ev) = @_; 1740 my ($self, $ev) = @_;
1561 1741
… …
1576 } elsif ($sym == CFClient::SDLK_HOME) { 1756 } elsif ($sym == CFClient::SDLK_HOME) {
1577 $self->{cursor} = 0; 1757 $self->{cursor} = 0;
1578 } elsif ($sym == CFClient::SDLK_END) { 1758 } elsif ($sym == CFClient::SDLK_END) {
1579 $self->{cursor} = length $text; 1759 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1760 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1761 $self->_emit ('escape');
1582 } elsif ($uni) { 1762 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1763 substr $text, $self->{cursor}++, 0, chr $uni;
1764 } else {
1765 return 0;
1584 } 1766 }
1585 1767
1586 $self->_set_text ($text); 1768 $self->_set_text ($text);
1587 $self->update; 1769
1588 $self->check_size; 1770 $self->realloc;
1771
1772 1
1589} 1773}
1590 1774
1591sub focus_in { 1775sub focus_in {
1592 my ($self) = @_; 1776 my ($self) = @_;
1593 1777
… …
1608 utf8::encode $text; 1792 utf8::encode $text;
1609 $self->{cursor} = length substr $text, 0, $idx; 1793 $self->{cursor} = length substr $text, 0, $idx;
1610 1794
1611 $self->_set_text ($self->{text}); 1795 $self->_set_text ($self->{text});
1612 $self->update; 1796 $self->update;
1797
1798 1
1613} 1799}
1614 1800
1615sub mouse_motion { 1801sub mouse_motion {
1616 my ($self, $ev, $x, $y) = @_; 1802 my ($self, $ev, $x, $y) = @_;
1617# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1803# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1804
1805 0
1618} 1806}
1619 1807
1620sub _draw { 1808sub _draw {
1621 my ($self) = @_; 1809 my ($self) = @_;
1622 1810
1623 local $self->{fg} = $self->{fg}; 1811 local $self->{fg} = $self->{fg};
1624 1812
1625 if ($FOCUS == $self) { 1813 if ($FOCUS == $self) {
1626 glColor @{$self->{active_bg}}; 1814 glColor_premultiply @{$self->{active_bg}};
1627 $self->{fg} = $self->{active_fg}; 1815 $self->{fg} = $self->{active_fg};
1628 } else { 1816 } else {
1629 glColor @{$self->{bg}}; 1817 glColor_premultiply @{$self->{bg}};
1630 } 1818 }
1631 1819
1632 glEnable GL_BLEND; 1820 glEnable GL_BLEND;
1633 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1821 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1634 glBegin GL_QUADS; 1822 glBegin GL_QUADS;
1635 glVertex 0 , 0; 1823 glVertex 0 , 0;
1636 glVertex 0 , $self->{h}; 1824 glVertex 0 , $self->{h};
1637 glVertex $self->{w}, $self->{h}; 1825 glVertex $self->{w}, $self->{h};
1638 glVertex $self->{w}, 0; 1826 glVertex $self->{w}, 0;
… …
1673 if ($sym == 13) { 1861 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1862 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1863 my $txt = $self->get_text;
1676 $self->{history_pointer} = -1; 1864 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1865 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1866 $self->_emit (activate => $txt);
1679 $self->update; 1867 $self->update;
1680 1868
1681 } elsif ($sym == CFClient::SDLK_UP) { 1869 } elsif ($sym == CFClient::SDLK_UP) {
1682 if ($self->{history_pointer} < 0) { 1870 if ($self->{history_pointer} < 0) {
1683 $self->{history_saveback} = $self->get_text; 1871 $self->{history_saveback} = $self->get_text;
… …
1699 } else { 1887 } else {
1700 $self->set_text ($self->{history_saveback}); 1888 $self->set_text ($self->{history_saveback});
1701 } 1889 }
1702 1890
1703 } else { 1891 } else {
1704 $self->SUPER::key_down ($ev); 1892 return $self->SUPER::key_down ($ev)
1893 }
1894
1705 } 1895 1
1706
1707} 1896}
1708 1897
1709############################################################################# 1898#############################################################################
1710 1899
1711package CFClient::UI::Button; 1900package CFClient::UI::Button;
… …
1720 1909
1721sub new { 1910sub new {
1722 my $class = shift; 1911 my $class = shift;
1723 1912
1724 $class->SUPER::new ( 1913 $class->SUPER::new (
1725 padding => 4, 1914 padding_x => 4,
1915 padding_y => 4,
1726 fg => [1, 1, 1], 1916 fg => [1, 1, 1],
1727 active_fg => [0, 0, 1], 1917 active_fg => [0, 0, 1],
1728 can_hover => 1, 1918 can_hover => 1,
1729 align => 0, 1919 align => 0,
1730 valign => 0, 1920 valign => 0,
1731 can_events => 1, 1921 can_events => 1,
1732 @_ 1922 @_
1733 ) 1923 )
1734} 1924}
1735 1925
1926sub activate { }
1927
1736sub button_up { 1928sub button_up {
1737 my ($self, $ev, $x, $y) = @_; 1929 my ($self, $ev, $x, $y) = @_;
1738 1930
1931 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1932 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1933 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate"); 1934
1742 } 1935 1
1743} 1936}
1744 1937
1745sub _draw { 1938sub _draw {
1746 my ($self) = @_; 1939 my ($self) = @_;
1747 1940
1748 local $self->{fg} = $self->{fg}; 1941 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1749
1750 if ($GRAB == $self) {
1751 $self->{fg} = $self->{active_fg};
1752 }
1753 1942
1754 glEnable GL_TEXTURE_2D; 1943 glEnable GL_TEXTURE_2D;
1755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1944 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1756 glColor 0, 0, 0, 1; 1945 glColor 0, 0, 0, 1;
1757 1946
… …
1776 1965
1777sub new { 1966sub new {
1778 my $class = shift; 1967 my $class = shift;
1779 1968
1780 $class->SUPER::new ( 1969 $class->SUPER::new (
1781 padding => 2, 1970 padding_x => 2,
1971 padding_y => 2,
1782 fg => [1, 1, 1], 1972 fg => [1, 1, 1],
1783 active_fg => [1, 1, 0], 1973 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2], 1974 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5], 1975 active_bg => [1, 1, 1, 0.5],
1786 state => 0, 1976 state => 0,
… …
1790} 1980}
1791 1981
1792sub size_request { 1982sub size_request {
1793 my ($self) = @_; 1983 my ($self) = @_;
1794 1984
1795 ($self->{padding} * 2 + 6) x 2 1985 (6) x 2
1796} 1986}
1797 1987
1798sub button_down { 1988sub button_down {
1799 my ($self, $ev, $x, $y) = @_; 1989 my ($self, $ev, $x, $y) = @_;
1800 1990
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1991 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1992 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1803 $self->{state} = !$self->{state}; 1993 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 1994 $self->_emit (changed => $self->{state});
1995 } else {
1996 return 0
1997 }
1998
1805 } 1999 1
1806} 2000}
1807 2001
1808sub _draw { 2002sub _draw {
1809 my ($self) = @_; 2003 my ($self) = @_;
1810 2004
1811 $self->SUPER::_draw; 2005 $self->SUPER::_draw;
1812 2006
1813 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2007 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1814 2008
1815 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2009 my ($w, $h) = @$self{qw(w h)};
2010
2011 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1816 2012
1817 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2013 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1818 2014
1819 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2015 my $tex = $self->{state} ? $tex[1] : $tex[0];
1820 2016
… …
1975 2171
1976 my $h1 = $self->{h} * (1 - $ycut1); 2172 my $h1 = $self->{h} * (1 - $ycut1);
1977 my $h2 = $self->{h} * (1 - $ycut2); 2173 my $h2 = $self->{h} * (1 - $ycut2);
1978 2174
1979 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2177 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D; 2178 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2179 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 2180
1984 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2181 glBindTexture GL_TEXTURE_2D, $t1->{name};
1985 glBegin GL_QUADS; 2182 glBegin GL_QUADS;
… …
2085 fg => [1, 1, 1], 2282 fg => [1, 1, 1],
2086 active_fg => [0, 0, 0], 2283 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2], 2284 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5], 2285 active_bg => [1, 1, 1, 0.5],
2089 range => [0, 0, 100, 10, 0], 2286 range => [0, 0, 100, 10, 0],
2090 req_w => $::WIDTH / 80, 2287 min_w => $::WIDTH / 80,
2091 req_h => $::WIDTH / 80, 2288 min_h => $::WIDTH / 80,
2092 vertical => 0, 2289 vertical => 0,
2093 can_hover => 1, 2290 can_hover => 1,
2094 inner_pad => 0.02, 2291 inner_pad => 0.02,
2095 @_ 2292 @_
2096 ); 2293 );
… …
2099 $self->update; 2296 $self->update;
2100 2297
2101 $self 2298 $self
2102} 2299}
2103 2300
2301sub changed { }
2302
2104sub set_range { 2303sub set_range {
2105 my ($self, $range) = @_; 2304 my ($self, $range) = @_;
2106 2305
2107 $self->{range} = $range; 2306 ($range, $self->{range}) = ($self->{range}, $range);
2108 2307
2109 $self->update; 2308 $self->update
2309 if "@$range" ne "@{$self->{range}}";
2110} 2310}
2111 2311
2112sub set_value { 2312sub set_value {
2113 my ($self, $value) = @_; 2313 my ($self, $value) = @_;
2114 2314
… …
2125 if $unit; 2325 if $unit;
2126 2326
2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2327 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128 2328
2129 if ($value != $old_value) { 2329 if ($value != $old_value) {
2130 $self->emit (changed => $value); 2330 $self->_emit (changed => $value);
2131 $self->update; 2331 $self->update;
2132 } 2332 }
2133} 2333}
2134 2334
2135sub size_request { 2335sub size_request {
2136 my ($self) = @_; 2336 my ($self) = @_;
2137 2337
2138 my $w = $self->{req_w}; 2338 ($self->{req_w}, $self->{req_h})
2139 my $h = $self->{req_h};
2140
2141 $self->{vertical} ? ($h, $w) : ($w, $h)
2142} 2339}
2143 2340
2144sub button_down { 2341sub button_down {
2145 my ($self, $ev, $x, $y) = @_; 2342 my ($self, $ev, $x, $y) = @_;
2146 2343
2147 $self->SUPER::button_down ($ev, $x, $y); 2344 $self->SUPER::button_down ($ev, $x, $y);
2148 2345
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2346 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150 2347
2151 $self->mouse_motion ($ev, $x, $y); 2348 $self->mouse_motion ($ev, $x, $y)
2152} 2349}
2153 2350
2154sub mouse_motion { 2351sub mouse_motion {
2155 my ($self, $ev, $x, $y) = @_; 2352 my ($self, $ev, $x, $y) = @_;
2156 2353
… …
2160 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2357 my (undef, $lo, $hi, $page) = @{$self->{range}};
2161 2358
2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2359 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2163 2360
2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2361 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2362 } else {
2363 return 0;
2364 }
2365
2165 } 2366 1
2166} 2367}
2167 2368
2168sub update { 2369sub update {
2169 my ($self) = @_; 2370 my ($self) = @_;
2170 2371
2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2372 delete $self->{knob_w};
2373 $self->SUPER::update;
2374}
2375
2376sub _draw {
2377 my ($self) = @_;
2378
2379 unless ($self->{knob_w}) {
2172 $self->set_value ($self->{range}[0]); 2380 $self->set_value ($self->{range}[0]);
2173 2381
2174 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2382 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100; 2383 my $range = ($hi - $page - $lo) || 1e-100;
2176 2384
… …
2182 $value = ($value - $lo) / $range; 2390 $value = ($value - $lo) / $range;
2183 $value = $value * $self->{scale} + $self->{offset}; 2391 $value = $value * $self->{scale} + $self->{offset};
2184 2392
2185 $self->{knob_x} = $value - $knob_w * 0.5; 2393 $self->{knob_x} = $value - $knob_w * 0.5;
2186 $self->{knob_w} = $knob_w; 2394 $self->{knob_w} = $knob_w;
2187 }); 2395 }
2188
2189 $self->SUPER::update;
2190}
2191
2192sub _draw {
2193 my ($self) = @_;
2194 2396
2195 $self->SUPER::_draw (); 2397 $self->SUPER::_draw ();
2196 2398
2197 glScale $self->{w}, $self->{h}; 2399 glScale $self->{w}, $self->{h};
2198 2400
… …
2392 2594
2393 delete $self->{texture}; 2595 delete $self->{texture};
2394 } 2596 }
2395 2597
2396 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2397 glClearColor 0.5, 0.5, 0.5, 0; 2599 glClearColor 0, 0, 0, 0;
2398 glClear GL_COLOR_BUFFER_BIT; 2600 glClear GL_COLOR_BUFFER_BIT;
2399 2601
2400 my $top = int $self->{children}[1]{range}[0]; 2602 my $top = int $self->{children}[1]{range}[0];
2401 2603
2402 my $y0 = $top; 2604 my $y0 = $top;
… …
2437sub _draw { 2639sub _draw {
2438 my ($self) = @_; 2640 my ($self) = @_;
2439 2641
2440 glEnable GL_TEXTURE_2D; 2642 glEnable GL_TEXTURE_2D;
2441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2442 glColor 1, 1, 1, 1; 2644 glColor 0, 0, 0, 1;
2443 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2645 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2444 glDisable GL_TEXTURE_2D; 2646 glDisable GL_TEXTURE_2D;
2445 2647
2446 $self->{children}[1]->draw; 2648 $self->{children}[1]->draw;
2447 2649
2448} 2650}
… …
2497 2699
2498sub new { 2700sub new {
2499 my $class = shift; 2701 my $class = shift;
2500 2702
2501 my $self = $class->SUPER::new ( 2703 my $self = $class->SUPER::new (
2502 state => 0, 2704 state => 0,
2503 connect_activate => \&toggle_flopper, 2705 on_activate => \&toggle_flopper,
2504 @_ 2706 @_
2505 ); 2707 );
2506 2708
2507 if ($self->{state}) {
2508 $self->{state} = 0;
2509 $self->toggle_flopper;
2510 }
2511
2512 $self 2709 $self
2513} 2710}
2514 2711
2515sub toggle_flopper { 2712sub toggle_flopper {
2516 my ($self) = @_; 2713 my ($self) = @_;
2517 2714
2518 # TODO: use animation 2715 $self->{other}->toggle_visibility;
2519 if ($self->{state} = !$self->{state}) {
2520 $CFClient::UI::ROOT->add ($self->{other});
2521 $self->{other}->move ($self->coord2global (0, $self->{h}));
2522 $self->emit ("open");
2523 } else {
2524 $CFClient::UI::ROOT->remove ($self->{other});
2525 $self->emit ("close");
2526 }
2527
2528 $self->emit (changed => $self->{state});
2529} 2716}
2530 2717
2531############################################################################# 2718#############################################################################
2532 2719
2533package CFClient::UI::Tooltip; 2720package CFClient::UI::Tooltip;
… …
2546} 2733}
2547 2734
2548sub set_tooltip_from { 2735sub set_tooltip_from {
2549 my ($self, $widget) = @_; 2736 my ($self, $widget) = @_;
2550 2737
2738 my $tooltip = $widget->{tooltip};
2739
2740 if ($ENV{CFPLUS_DEBUG} & 2) {
2741 $tooltip .= "\n\n" . (ref $widget) . "\n"
2742 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2743 . "req $widget->{req_w} $widget->{req_h}\n"
2744 . "visible $widget->{visible}";
2745 }
2746
2551 $self->add (new CFClient::UI::Label 2747 $self->add (new CFClient::UI::Label
2552 markup => $widget->{tooltip}, 2748 markup => $tooltip,
2553 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2749 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2554 fontsize => 0.8, 2750 fontsize => 0.8,
2555 fg => [0, 0, 0, 1], 2751 fg => [0, 0, 0, 1],
2556 ellipsise => 0, 2752 ellipsise => 0,
2557 font => ($widget->{tooltip_font} || $::FONT_PROP), 2753 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2568 2764
2569sub size_allocate { 2765sub size_allocate {
2570 my ($self, $w, $h) = @_; 2766 my ($self, $w, $h) = @_;
2571 2767
2572 $self->SUPER::size_allocate ($w - 4, $h - 4); 2768 $self->SUPER::size_allocate ($w - 4, $h - 4);
2769}
2770
2771sub visibility_change {
2772 my ($self, $visible) = @_;
2773
2774 return unless $visible;
2775
2776 $self->{root}->on_post_alloc ("move_$self" => sub {
2777 my $widget = $self->{owner}
2778 or return;
2779
2780 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781
2782 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783 if $x + $self->{w} > $::WIDTH;
2784
2785 $self->move_abs ($x, $y);
2786 });
2573} 2787}
2574 2788
2575sub _draw { 2789sub _draw {
2576 my ($self) = @_; 2790 my ($self) = @_;
2577 2791
… …
2594 glVertex $w, $h; 2808 glVertex $w, $h;
2595 glVertex $w, 0; 2809 glVertex $w, 0;
2596 glEnd; 2810 glEnd;
2597 2811
2598 glTranslate 2 - 0.375, 2 - 0.375; 2812 glTranslate 2 - 0.375, 2 - 0.375;
2813
2599 $self->SUPER::_draw; 2814 $self->SUPER::_draw;
2600} 2815}
2601 2816
2602############################################################################# 2817#############################################################################
2603 2818
… …
2609 2824
2610sub new { 2825sub new {
2611 my $class = shift; 2826 my $class = shift;
2612 2827
2613 my $self = $class->SUPER::new ( 2828 my $self = $class->SUPER::new (
2614 aspect => 1, 2829 aspect => 1,
2830 can_events => 0,
2615 @_, 2831 @_,
2616 ); 2832 );
2617 2833
2618 if ($self->{anim} && $self->{animspeed}) { 2834 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2835 Scalar::Util::weaken (my $widget = $self);
… …
2661 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2877 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2662 2878
2663 if ($tex) { 2879 if ($tex) {
2664 glEnable GL_TEXTURE_2D; 2880 glEnable GL_TEXTURE_2D;
2665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2881 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2666 glColor 1, 1, 1, 1; 2882 glColor 0, 0, 0, 1;
2667 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2883 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2668 glDisable GL_TEXTURE_2D; 2884 glDisable GL_TEXTURE_2D;
2669 } 2885 }
2670} 2886}
2671 2887
… …
2678 $self->SUPER::DESTROY; 2894 $self->SUPER::DESTROY;
2679} 2895}
2680 2896
2681############################################################################# 2897#############################################################################
2682 2898
2683package CFClient::UI::InventoryItem; 2899package CFClient::UI::Buttonbar;
2684 2900
2685our @ISA = CFClient::UI::HBox::; 2901our @ISA = CFClient::UI::HBox::;
2686 2902
2687sub _item_to_desc { 2903# TODO: should actualyl wrap buttons and other goodies.
2688 my ($item) = @_;
2689
2690 my $desc =
2691 $item->{nrof} < 2
2692 ? $item->{name}
2693 : "$item->{nrof} × $item->{name_pl}";
2694
2695 $item->{flags} & Crossfire::Protocol::F_OPEN
2696 and $desc .= " (open)";
2697 $item->{flags} & Crossfire::Protocol::F_APPLIED
2698 and $desc .= " (applied)";
2699 $item->{flags} & Crossfire::Protocol::F_UNPAID
2700 and $desc .= " (unpaid)";
2701 $item->{flags} & Crossfire::Protocol::F_MAGIC
2702 and $desc .= " (magic)";
2703 $item->{flags} & Crossfire::Protocol::F_CURSED
2704 and $desc .= " (cursed)";
2705 $item->{flags} & Crossfire::Protocol::F_DAMNED
2706 and $desc .= " (damned)";
2707 $item->{flags} & Crossfire::Protocol::F_LOCKED
2708 and $desc .= " *";
2709
2710 $desc
2711}
2712
2713sub new {
2714 my $class = shift;
2715
2716 my %args = @_;
2717
2718 my $item = delete $args{item};
2719
2720 my $desc = _item_to_desc ($item);
2721
2722 my $self = $class->SUPER::new (
2723 can_hover => 1,
2724 can_events => 1,
2725 tooltip => ((CFClient::UI::Label::escape $desc)
2726 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2727 connect_button_down => sub {
2728 my ($self, $ev, $x, $y) = @_;
2729
2730 # todo: maybe put examine on 1? but should just be a tooltip :(
2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2732 my $targ = $::CONN->{player}{tag};
2733
2734 if ($item->{container} == $::CONN->{player}{tag}) {
2735 $targ = $main::OPENCONT;
2736 }
2737
2738 $::CONN->send ("move $targ $item->{tag} 0");
2739 } elsif ($ev->{button} == 1) {
2740 $::CONN->send ("examine $item->{tag}");
2741 } elsif ($ev->{button} == 2) {
2742 $::CONN->send ("apply $item->{tag}");
2743 } elsif ($ev->{button} == 3) {
2744 my @menu_items = (
2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2746 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2747 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748 (
2749 $item->{flags} & Crossfire::Protocol::F_LOCKED
2750 ? (
2751 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752 )
2753 : (
2754 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2755 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2756 )
2757 ),
2758 );
2759
2760 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2761 }
2762
2763 1
2764 },
2765 %args
2766 );
2767
2768
2769 $self->add (new CFClient::UI::Face
2770 can_events => 0,
2771 face => $item->{face},
2772 anim => $item->{anim},
2773 animspeed => $item->{animspeed},
2774 );
2775
2776 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2777
2778 $self->{item} = $item;
2779
2780 $self->update_item;
2781
2782 $self
2783}
2784
2785sub update_item {
2786 my ($self) = @_;
2787
2788 my $desc = _item_to_desc ($self->{item});
2789
2790 $self->{name_lbl}->set_text ($desc);
2791}
2792
2793#############################################################################
2794
2795package CFClient::UI::Inventory;
2796
2797our @ISA = CFClient::UI::ScrolledWindow::;
2798
2799sub new {
2800 my $class = shift;
2801
2802 my $self = $class->SUPER::new (
2803 scrolled => (new CFClient::UI::Table),
2804 @_,
2805 );
2806
2807 $self
2808}
2809
2810sub set_items {
2811 my ($self, $items) = @_;
2812
2813 $self->{scrolled}->clear;
2814 return unless $items;
2815
2816 my @items = sort {
2817 ($a->{type} <=> $b->{type})
2818 or ($a->{name} cmp $b->{name})
2819 } @$items;
2820
2821 $self->{real_items} = \@items;
2822
2823 for my $item (@items) {
2824 $item->{item} = $item;
2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2827 }
2828
2829 my $i = 0;
2830 for (@items) {
2831 $self->{scrolled}->add (0, $i, $_);
2832 my $nrof = $_->{item}->{nrof} || 1;
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834 }
2835
2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2837}
2838
2839sub size_request {
2840 my ($self) = @_;
2841 ($self->{req_w}, $self->{req_h});
2842}
2843 2904
2844############################################################################# 2905#############################################################################
2845 2906
2846package CFClient::UI::Menu; 2907package CFClient::UI::Menu;
2847 2908
… …
2881 2942
2882# popup given the event (must be a mouse button down event currently) 2943# popup given the event (must be a mouse button down event currently)
2883sub popup { 2944sub popup {
2884 my ($self, $ev) = @_; 2945 my ($self, $ev) = @_;
2885 2946
2886 $self->emit ("popdown"); 2947 $self->_emit ("popdown");
2887 2948
2888 # maybe save $GRAB? must be careful about events... 2949 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 2950 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 2951 $self->{button} = $ev->{button};
2891 2952
2892 $self->show; 2953 $self->show;
2893 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2954 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2894} 2955}
2895 2956
2896sub mouse_motion { 2957sub mouse_motion {
2897 my ($self, $ev, $x, $y) = @_; 2958 my ($self, $ev, $x, $y) = @_;
2898 2959
2899 # TODO: should use vbox->find_widget or so 2960 # TODO: should use vbox->find_widget or so
2900 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2961 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2901 $self->{hover} = $self->{item}{$HOVER}; 2962 $self->{hover} = $self->{item}{$HOVER};
2963
2964 0
2902} 2965}
2903 2966
2904sub button_up { 2967sub button_up {
2905 my ($self, $ev, $x, $y) = @_; 2968 my ($self, $ev, $x, $y) = @_;
2906 2969
2907 if ($ev->{button} == $self->{button}) { 2970 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 2971 undef $GRAB;
2909 $self->hide; 2972 $self->hide;
2910 2973
2911 $self->emit ("popdown"); 2974 $self->_emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 2975 $self->{hover}[1]->() if $self->{hover};
2976 } else {
2977 return 0
2978 }
2979
2913 } 2980 1
2914} 2981}
2915 2982
2916############################################################################# 2983#############################################################################
2917 2984
2918package CFClient::UI::Statusbox; 2985package CFClient::UI::Multiplexer;
2919 2986
2920our @ISA = CFClient::UI::VBox::; 2987our @ISA = CFClient::UI::Container::;
2921 2988
2922sub new { 2989sub new {
2923 my $class = shift; 2990 my $class = shift;
2924 2991
2925 $class->SUPER::new ( 2992 my $self = $class->SUPER::new (
2993 @_,
2994 );
2995
2996 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} };
2998
2999 $self
3000}
3001
3002sub add {
3003 my ($self, @widgets) = @_;
3004
3005 $self->SUPER::add (@widgets);
3006
3007 $self->{current} = $self->{children}[0]
3008 if @{ $self->{children} };
3009}
3010
3011sub set_current_page {
3012 my ($self, $page_or_widget) = @_;
3013
3014 my $widget = ref $page_or_widget
3015 ? $page_or_widget
3016 : $self->{children}[$page_or_widget];
3017
3018 $self->{current} = $widget;
3019 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3020
3021 $self->_emit (page_changed => $self->{current});
3022
3023 $self->realloc;
3024}
3025
3026sub visible_children {
3027 $_[0]{current}
3028}
3029
3030sub size_request {
3031 my ($self) = @_;
3032
3033 $self->{current}->size_request
3034}
3035
3036sub size_allocate {
3037 my ($self, $w, $h) = @_;
3038
3039 $self->{current}->configure (0, 0, $w, $h);
3040}
3041
3042sub _draw {
3043 my ($self) = @_;
3044
3045 $self->{current}->draw;
3046}
3047
3048#############################################################################
3049
3050package CFClient::UI::Notebook;
3051
3052our @ISA = CFClient::UI::VBox::;
3053
3054sub new {
3055 my $class = shift;
3056
3057 my $self = $class->SUPER::new (
3058 buttonbar => (new CFClient::UI::Buttonbar),
3059 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3060 # filter => # will be put between multiplexer and $self
3061 @_,
3062 );
3063
3064 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3065 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3066
3067 $self
3068}
3069
3070sub add {
3071 my ($self, $title, $widget, $tooltip) = @_;
3072
3073 Scalar::Util::weaken $self;
3074
3075 $self->{buttonbar}->add (new CFClient::UI::Button
3076 markup => $title,
3077 tooltip => $tooltip,
3078 on_activate => sub { $self->set_current_page ($widget) },
3079 );
3080
3081 $self->{multiplexer}->add ($widget);
3082}
3083
3084sub set_current_page {
3085 my ($self, $page) = @_;
3086
3087 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current});
3089}
3090
3091#############################################################################
3092
3093package CFClient::UI::Statusbox;
3094
3095our @ISA = CFClient::UI::VBox::;
3096
3097sub new {
3098 my $class = shift;
3099
3100 my $self = $class->SUPER::new (
2926 fontsize => 0.8, 3101 fontsize => 0.8,
2927 @_, 3102 @_,
2928 ) 3103 );
3104
3105 Scalar::Util::weaken (my $this = $self);
3106
3107 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3108
3109 $self
2929} 3110}
2930 3111
2931sub reorder { 3112sub reorder {
2932 my ($self) = @_; 3113 my ($self) = @_;
2933 my $NOW = time; 3114 my $NOW = Time::HiRes::time;
3115
3116 # freeze display when hovering over any label
3117 return if $CFClient::UI::TOOLTIP->{owner}
3118 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3119 values %{ $self->{item} };
2934 3120
2935 while (my ($k, $v) = each %{ $self->{item} }) { 3121 while (my ($k, $v) = each %{ $self->{item} }) {
2936 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3122 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2937 } 3123 }
2938 3124
… …
2941 my @items = sort { 3127 my @items = sort {
2942 $a->{pri} <=> $b->{pri} 3128 $a->{pri} <=> $b->{pri}
2943 or $b->{id} <=> $a->{id} 3129 or $b->{id} <=> $a->{id}
2944 } values %{ $self->{item} }; 3130 } values %{ $self->{item} };
2945 3131
3132 $self->{timer}->interval (1);
3133
2946 my $count = 10 + 1; 3134 my $count = 10 + 1;
2947 for my $item (@items) { 3135 for my $item (@items) {
2948 last unless --$count; 3136 last unless --$count;
2949 3137
2950 push @widgets, $item->{label} ||= do { 3138 my $label = $item->{label} ||= do {
2951 # TODO: doesn't handle markup well (read as: at all) 3139 # TODO: doesn't handle markup well (read as: at all)
2952 my $short = $item->{count} > 1 3140 my $short = $item->{count} > 1
2953 ? "<b>$item->{count} ×</b> $item->{text}" 3141 ? "<b>$item->{count} ×</b> $item->{text}"
2954 : $item->{text}; 3142 : $item->{text};
2955 3143
… …
2963 tooltip => $item->{tooltip}, 3151 tooltip => $item->{tooltip},
2964 tooltip_font => $::FONT_PROP, 3152 tooltip_font => $::FONT_PROP,
2965 tooltip_width => 0.67, 3153 tooltip_width => 0.67,
2966 fontsize => $item->{fontsize} || $self->{fontsize}, 3154 fontsize => $item->{fontsize} || $self->{fontsize},
2967 max_w => $::WIDTH * 0.44, 3155 max_w => $::WIDTH * 0.44,
2968 fg => $item->{fg}, 3156 fg => [@{ $item->{fg} }],
2969 can_events => 1, 3157 can_events => 1,
2970 can_hover => 1 3158 can_hover => 1
2971 }; 3159 };
3160
3161 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3162 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3163 $label->update;
3164 $label->set_max_size (undef, $label->{req_h} * $diff)
3165 if $diff < 1;
3166 $self->{timer}->interval (1/30);
3167 } else {
3168 $label->{fg}[3] = $item->{fg}[3] || 1;
3169 }
3170
3171 push @widgets, $label;
2972 } 3172 }
2973 3173
2974 $self->clear; 3174 $self->clear;
2975 $self->SUPER::add (reverse @widgets); 3175 $self->SUPER::add (reverse @widgets);
2976} 3176}
… …
2979 my ($self, $text, %arg) = @_; 3179 my ($self, $text, %arg) = @_;
2980 3180
2981 $text =~ s/^\s+//; 3181 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 3182 $text =~ s/\s+$//;
2983 3183
3184 return unless $text;
3185
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 3186 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2985 3187
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3188 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 3189
2988 if (my $item = $self->{item}{$group}) { 3190 if (my $item = $self->{item}{$group}) {
2989 if ($item->{text} eq $text) { 3191 if ($item->{text} eq $text) {
… …
3019 3221
3020 $self->reorder; 3222 $self->reorder;
3021 $self->SUPER::reconfigure; 3223 $self->SUPER::reconfigure;
3022} 3224}
3023 3225
3226sub DESTROY {
3227 my ($self) = @_;
3228
3229 $self->{timer}->cancel;
3230
3231 $self->SUPER::DESTROY;
3232}
3233
3024############################################################################# 3234#############################################################################
3025 3235
3026package CFClient::UI::Root; 3236package CFClient::UI::Inventory;
3027 3237
3028our @ISA = CFClient::UI::Container::; 3238our @ISA = CFClient::UI::ScrolledWindow::;
3029
3030use CFClient::OpenGL;
3031 3239
3032sub new { 3240sub new {
3033 my $class = shift; 3241 my $class = shift;
3034 3242
3035 $class->SUPER::new ( 3243 my $self = $class->SUPER::new (
3244 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3245 @_,
3246 );
3247
3248 $self
3249}
3250
3251sub set_items {
3252 my ($self, $items) = @_;
3253
3254 $self->{child}->clear;
3255 return unless $items;
3256
3257 my @items = sort {
3258 ($a->{type} <=> $b->{type})
3259 or ($a->{name} cmp $b->{name})
3260 } @$items;
3261
3262 $self->{real_items} = \@items;
3263
3264 my $row = 0;
3265 for my $item (@items) {
3266 CFClient::Item::update_widgets $item;
3267
3268 $self->{child}->add (0, $row, $item->{face_widget});
3269 $self->{child}->add (1, $row, $item->{desc_widget});
3270 $self->{child}->add (2, $row, $item->{weight_widget});
3271
3272 $row++;
3273 }
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::BindEditor;
3279
3280our @ISA = CFClient::UI::FancyFrame::;
3281
3282sub new {
3283 my $class = shift;
3284
3285 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3286
3287 $self->add (my $vb = new CFClient::UI::VBox);
3288
3289
3290 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3291 text => "start recording",
3292 tooltip => "Start/Stops recording of actions."
3293 ."All subsequent actions after the recording started will be captured."
3294 ."The actions are displayed after the record was stopped."
3295 ."To bind the action you have to click on the 'Bind' button",
3296 on_activate => sub {
3297 unless ($self->{recording}) {
3298 $self->start;
3299 } else {
3300 $self->stop;
3301 }
3302 });
3303
3304 $vb->add (new CFClient::UI::Label text => "Actions:");
3305 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3306
3307 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3310 $hb->add (new CFClient::UI::Button
3311 text => "bind",
3312 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3313 on_activate => sub {
3314 $self->ask_for_bind;
3315 });
3316
3317 $vb->add (my $hb = new CFClient::UI::HBox);
3318 $hb->add (new CFClient::UI::Button
3319 text => "ok",
3320 expand => 1,
3321 tooltip => "This closes the binding editor and saves the binding",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->commit;
3325 });
3326
3327 $hb->add (new CFClient::UI::Button
3328 text => "cancel",
3329 expand => 1,
3330 tooltip => "This closes the binding editor without saving",
3331 on_activate => sub {
3332 $self->hide;
3333 $self->{binding_cancel}->()
3334 if $self->{binding_cancel};
3335 });
3336
3337 $self->update_binding_widgets;
3338
3339 $self
3340}
3341
3342sub commit {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 if ($sym != 0 && @$cmds > 0) {
3346 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3347 ."'. Don't forget 'Save Config'!");
3348 $self->{binding_change}->($mod, $sym, $cmds)
3349 if $self->{binding_change};
3350 } else {
3351 $::STATUSBOX->add ("No action bound, no key or action specified!");
3352 $self->{binding_cancel}->()
3353 if $self->{binding_cancel};
3354 }
3355}
3356
3357sub start {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("stop recording");
3361 $self->{recording} = 1;
3362 $self->clear_command_list;
3363 $::CONN->start_record if $::CONN;
3364}
3365
3366sub stop {
3367 my ($self) = @_;
3368
3369 $self->{rec_btn}->set_text ("start recording");
3370 $self->{recording} = 0;
3371
3372 my $rec;
3373 $rec = $::CONN->stop_record if $::CONN;
3374 return unless ref $rec eq 'ARRAY';
3375 $self->set_command_list ($rec);
3376}
3377
3378
3379sub ask_for_bind_and_commit {
3380 my ($self) = @_;
3381 $self->ask_for_bind (1);
3382}
3383
3384sub ask_for_bind {
3385 my ($self, $commit) = @_;
3386
3387 CFClient::Binder::open_binding_dialog (sub {
3388 my ($mod, $sym) = @_;
3389 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3390 $self->update_binding_widgets;
3391 $self->commit if $commit;
3392 });
3393}
3394
3395# $mod and $sym are the modifiers and key symbol
3396# $cmds is a array ref of strings (the commands)
3397# $cb is the callback that is executed on OK
3398# $ccb is the callback that is executed on CANCEL and
3399# when the binding was unsuccessful on OK
3400sub set_binding {
3401 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3402
3403 $self->clear_command_list;
3404 $self->{recording} = 0;
3405 $self->{rec_btn}->set_text ("start recording");
3406
3407 $self->{binding} = [$mod, $sym];
3408 $self->{commands} = $cmds;
3409
3410 $self->{binding_change} = $cb;
3411 $self->{binding_cancel} = $ccb;
3412
3413 $self->update_binding_widgets;
3414}
3415
3416# this is a shortcut method that asks for a binding
3417# and then just binds it.
3418sub do_quick_binding {
3419 my ($self, $cmds) = @_;
3420 $self->set_binding (undef, undef, $cmds, sub {
3421 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3422 });
3423 $self->ask_for_bind (1);
3424}
3425
3426sub update_binding_widgets {
3427 my ($self) = @_;
3428 my ($mod, $sym, $cmds) = $self->get_binding;
3429 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3430 $self->set_command_list ($cmds);
3431}
3432
3433sub get_binding {
3434 my ($self) = @_;
3435 return (
3436 $self->{binding}->[0],
3437 $self->{binding}->[1],
3438 [ grep { defined $_ } @{$self->{commands}} ]
3439 );
3440}
3441
3442sub clear_command_list {
3443 my ($self) = @_;
3444 $self->{cmdbox}->clear ();
3445}
3446
3447sub set_command_list {
3448 my ($self, $cmds) = @_;
3449
3450 $self->{cmdbox}->clear ();
3451 $self->{commands} = $cmds;
3452
3453 my $idx = 0;
3454
3455 for (@$cmds) {
3456 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3457
3458 my $i = $idx;
3459 $hb->add (new CFClient::UI::Label text => $_);
3460 $hb->add (new CFClient::UI::Button
3461 text => "delete",
3462 tooltip => "Deletes the action from the record",
3463 on_activate => sub {
3464 $self->{cmdbox}->remove ($hb);
3465 $cmds->[$i] = undef;
3466 });
3467
3468
3469 $idx++
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::SpellList;
3476
3477our @ISA = CFClient::UI::Table::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (
3483 binding => [],
3484 commands => [],
3036 @_, 3485 @_,
3037 ) 3486 )
3038} 3487}
3039 3488
3040sub configure { 3489my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3041 my ($self, $x, $y, $w, $h) = @_; 3490 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3491my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3492 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3493my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3494 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3042 3495
3043 $self->{w} = $w; 3496sub rebuild_spell_list {
3044 $self->{h} = $h; 3497 my ($self) = @_;
3045}
3046 3498
3047sub check_size { 3499 $CFClient::UI::ROOT->on_refresh ($self => sub {
3500 $self->clear;
3501
3502 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3503 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3504 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3505 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3506
3507 my $row = 0;
3508
3509 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510 my $spell = $self->{spell}{$_};
3511
3512 $row++;
3513
3514 $self->add (0, $row, new CFClient::UI::Face
3515 face => $spell->{face},
3516 can_hover => 1,
3517 can_events => 1,
3518 tooltip => $spell->{message},
3519 );
3520
3521 $self->add (1, $row, new CFClient::UI::Label
3522 expand => 1,
3523 text => $spell->{name},
3524 can_hover => 1,
3525 can_events => 1,
3526 tooltip => $spell->{message},
3527 );
3528
3529 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3530 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3531 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3532
3533 # TODO: should be done via popup
3534 $self->add (5, $row, new CFClient::UI::Button
3535 text => "bind",
3536 tooltip => "bind spell readying (cast command) to key",
3537 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538 );
3539 }
3540 });
3541}
3542
3543sub add_spell {
3048 my ($self) = @_; 3544 my ($self, $spell) = @_;
3049 3545
3050 $self->size_allocate ($self->{w}, $self->{h}) 3546 $self->{spell}->{$spell->{name}} = $spell;
3051 if $self->{w}; 3547 $self->rebuild_spell_list;
3548}
3549
3550sub remove_spell {
3551 my ($self, $spell) = @_;
3552
3553 delete $self->{spell}->{$spell->{name}};
3554 $self->rebuild_spell_list;
3555}
3556
3557#############################################################################
3558
3559package CFClient::UI::Root;
3560
3561our @ISA = CFClient::UI::Container::;
3562
3563use List::Util qw(min max);
3564
3565use CFClient::OpenGL;
3566
3567sub new {
3568 my $class = shift;
3569
3570 my $self = $class->SUPER::new (
3571 visible => 1,
3572 @_,
3573 );
3574
3575 Scalar::Util::weaken ($self->{root} = $self);
3576
3577 $self
3052} 3578}
3053 3579
3054sub size_request { 3580sub size_request {
3055 my ($self) = @_; 3581 my ($self) = @_;
3056 3582
3057 ($self->{w}, $self->{h}) 3583 ($self->{w}, $self->{h})
3584}
3585
3586sub _to_pixel {
3587 my ($coord, $size, $max) = @_;
3588
3589 $coord =
3590 $coord eq "center" ? ($max - $size) * 0.5
3591 : $coord eq "max" ? $max
3592 : $coord;
3593
3594 $coord = 0 if $coord < 0;
3595 $coord = $max - $size if $coord > $max - $size;
3596
3597 int $coord + 0.5
3058} 3598}
3059 3599
3060sub size_allocate { 3600sub size_allocate {
3061 my ($self, $w, $h) = @_; 3601 my ($self, $w, $h) = @_;
3062 3602
3063 for my $child ($self->children) { 3603 for my $child ($self->children) {
3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3604 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3065 3605
3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3606 $X = $child->{force_x} if exists $child->{force_x};
3067 if exists $child->{req_x}; 3607 $Y = $child->{force_y} if exists $child->{force_y};
3068 3608
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3609 $X = _to_pixel $X, $W, $self->{w};
3070 if exists $child->{req_y}; 3610 $Y = _to_pixel $Y, $H, $self->{h};
3071
3072 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3073 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3074 3611
3075 $child->configure ($X, $Y, $W, $H); 3612 $child->configure ($X, $Y, $W, $H);
3076 } 3613 }
3077} 3614}
3078 3615
… …
3089} 3626}
3090 3627
3091sub update { 3628sub update {
3092 my ($self) = @_; 3629 my ($self) = @_;
3093 3630
3094 $self->check_size;
3095 $::WANT_REFRESH++; 3631 $::WANT_REFRESH++;
3096} 3632}
3097 3633
3098sub add { 3634sub add {
3099 my ($self, @children) = @_; 3635 my ($self, @children) = @_;
3100 3636
3101 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children;
3103 $w->{root} = $self;
3104 $w->{visible} = 1;
3105 }
3106
3107 for my $child (@children) {
3108 $child->{is_toplevel} = 1; 3637 $_->{is_toplevel} = 1
3109 3638 for @children;
3110 # integerise window positions
3111 $child->{x} = int $child->{x};
3112 $child->{y} = int $child->{y};
3113 }
3114 3639
3115 $self->SUPER::add (@children); 3640 $self->SUPER::add (@children);
3116} 3641}
3117 3642
3118sub remove { 3643sub remove {
3119 my ($self, @children) = @_; 3644 my ($self, @children) = @_;
3120 3645
3121 $self->SUPER::remove (@children); 3646 $self->SUPER::remove (@children);
3647
3648 delete $self->{is_toplevel}
3649 for @children;
3122 3650
3123 while (@children) { 3651 while (@children) {
3124 my $w = pop @children; 3652 my $w = pop @children;
3125 push @children, $w->children; 3653 push @children, $w->children;
3126 delete $w->{visible}; 3654 $w->set_invisible;
3127 } 3655 }
3128} 3656}
3129 3657
3130sub on_refresh { 3658sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3659 my ($self, $id, $cb) = @_;
… …
3145 while ($self->{refresh_hook}) { 3673 while ($self->{refresh_hook}) {
3146 $_->() 3674 $_->()
3147 for values %{delete $self->{refresh_hook}}; 3675 for values %{delete $self->{refresh_hook}};
3148 } 3676 }
3149 3677
3150 if ($self->{check_size}) { 3678 if ($self->{realloc}) {
3151 my @queue = ([], []); 3679 my %queue;
3680 my @queue;
3681 my $widget;
3152 3682
3153 for (;;) { 3683 outer:
3154 if ($self->{check_size}) { 3684 while () {
3155 # heuristic: check containers last 3685 if (my $realloc = delete $self->{realloc}) {
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3686 for $widget (values %$realloc) {
3157 for values %{delete $self->{check_size}} 3687 $widget->{visible} or next; # do not resize invisible widgets
3688
3689 $queue{$widget+0}++ and next; # duplicates are common
3690
3691 push @{ $queue[$widget->{visible}] }, $widget;
3692 }
3158 } 3693 }
3159 3694
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3695 while () {
3696 @queue or last outer;
3161 3697
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3698 $widget = pop @{ $queue[-1] || [] }
3163 ? @$widget{qw(user_w user_h)} 3699 and last;
3164 : $widget->size_request;
3165
3166 if (delete $widget->{force_alloc}
3167 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3168 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3169 3700
3701 pop @queue;
3702 }
3703
3704 delete $queue{$widget+0};
3705
3706 my ($w, $h) = $widget->size_request;
3707
3708 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3709 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3710
3711 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3712 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3713
3714 $w = $widget->{force_w} if exists $widget->{force_w};
3715 $h = $widget->{force_h} if exists $widget->{force_h};
3716
3717 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3718 || delete $widget->{force_realloc}) {
3170 $widget->{req_w} = $w; 3719 $widget->{req_w} = $w;
3171 $widget->{req_h} = $h; 3720 $widget->{req_h} = $h;
3172 3721
3173 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3722 $self->{size_alloc}{$widget+0} = $widget;
3174 3723
3175 $widget->{parent}->check_size
3176 if $widget->{parent}; 3724 if (my $parent = $widget->{parent}) {
3725 $self->{realloc}{$parent+0} = $parent
3726 unless $queue{$parent+0};
3727
3728 $parent->{force_size_alloc} = 1;
3729 $self->{size_alloc}{$parent+0} = $parent;
3730 }
3177 } 3731 }
3732
3733 delete $self->{realloc}{$widget+0};
3178 } 3734 }
3179 } 3735 }
3180 3736
3181 while ($self->{size_alloc}) { 3737 while (my $size_alloc = delete $self->{size_alloc}) {
3182 for (values %{delete $self->{size_alloc}}) { 3738 my @queue = sort { $b->{visible} <=> $a->{visible} }
3183 my ($widget, $w, $h) = @$_; 3739 values %$size_alloc;
3740
3741 while () {
3742 my $widget = pop @queue || last;
3743
3744 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3184 3745
3185 $w = 0 if $w < 0; 3746 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3747 $h = 0 if $h < 0;
3187 3748
3749 $w = int $w + 0.5;
3750 $h = int $h + 0.5;
3751
3752 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3753 $widget->{old_w} = $widget->{w};
3754 $widget->{old_h} = $widget->{h};
3755
3188 $widget->{w} = $w; 3756 $widget->{w} = $w;
3189 $widget->{h} = $h; 3757 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h); 3758
3191 $widget->emit (size_allocate => $w, $h); 3759 $widget->emit (size_allocate => $w, $h);
3760 }
3192 } 3761 }
3193 } 3762 }
3194 3763
3195 while ($self->{post_alloc_hook}) { 3764 while ($self->{post_alloc_hook}) {
3196 $_->() 3765 $_->()
3197 for values %{delete $self->{post_alloc_hook}}; 3766 for values %{delete $self->{post_alloc_hook}};
3198 } 3767 }
3768
3199 3769
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3770 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3771 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT; 3772 glClear GL_COLOR_BUFFER_BIT;
3203 3773
… …
3205 glLoadIdentity; 3775 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3776 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3777 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3778 glLoadIdentity;
3209 3779
3780 {
3781 package CFClient::UI::Base;
3782
3783 ($draw_x, $draw_y, $draw_w, $draw_h) =
3784 (0, 0, $self->{w}, $self->{h});
3785 }
3786
3210 $self->_draw; 3787 $self->_draw;
3211} 3788}
3212 3789
3213############################################################################# 3790#############################################################################
3214 3791

Diff Legend

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