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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 2006 UTC

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

Diff Legend

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