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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{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
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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.]+$/;
163 $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};
164 $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};
165 $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
166 } 190 }
167
168 $widget->reconfigure;
169 } 191 }
192
193 reconfigure_widgets;
170} 194}
171 195
172############################################################################# 196#############################################################################
173 197
174package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 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 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
212 return if $self->{parent}; 250 return if $self->{parent};
213 251
214 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
215} 253}
216 254
217sub hide { 255sub set_visible {
218 my ($self) = @_; 256 my ($self) = @_;
257
258 return if $self->{visible};
259
260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
262
263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
278 delete $self->{root};
219 279
220 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
221 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
222 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
306}
307
308sub hide {
309 my ($self) = @_;
310
311 $self->set_invisible;
312
223 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
224 if $self->{parent}; 314 if $self->{parent};
225} 315}
226 316
227sub move { 317sub move_abs {
228 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
229 319
230 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
231 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
232 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
233 323
234 $self->update; 324 $self->update;
235} 325}
236 326
237sub set_size { 327sub set_size {
238 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
239 329
240 $self->{user_w} = $w; 330 $self->{force_w} = $w;
241 $self->{user_h} = $h; 331 $self->{force_h} = $h;
242 332
243 $self->check_size; 333 $self->realloc;
244} 334}
245 335
246sub size_request { 336sub size_request {
247 require Carp; 337 require Carp;
248 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
250 340
251sub configure { 341sub configure {
252 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
253 343
254 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
255 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
256 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
257 349
258 # use alignment to adjust x, y 350 # use alignment to adjust x, y
259 351
260 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
261 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
262
263 ($w, $h) = ($w2, $h2);
264 } 354 }
265 355
266 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
267 $self->{x} = $x; 357 $self->{x} = $x;
268 $self->{y} = $y; 358 $self->{y} = $y;
269 $self->update; 359 $self->update;
270 } 360 }
271 361
272 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
273 $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;
274 } 369 }
275} 370}
276 371
277sub size_allocate { 372sub size_allocate {
278 # nothing to be done 373 # nothing to be done
279} 374}
280 375
281sub reconfigure {
282 my ($self) = @_;
283
284 $self->check_size (1);
285 $self->update;
286}
287
288sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
289} 382}
290 383
291sub set_max_size { 384sub set_max_size {
292 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
293 386
294 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
295 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
296} 391}
297 392
298sub set_tooltip { 393sub set_tooltip {
299 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
300 395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
301 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
302 402
303 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
305 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
306 } 406 }
307} 407}
308 408
309# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
310sub coord2local { 410sub coord2local {
… …
326 return if $FOCUS == $self; 426 return if $FOCUS == $self;
327 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
328 428
329 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
330 430
331 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
332 432
333 $focus->update if $focus; 433 $focus->update if $focus;
334 $FOCUS->update; 434 $FOCUS->update;
335} 435}
336 436
… …
339 439
340 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
341 441
342 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
343 443
344 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
345 445
346 $focus->update if $focus; #? 446 $focus->update if $focus; #?
347}
348 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
349sub mouse_motion { } 452sub mouse_motion { 0 }
350sub button_up { } 453sub button_up { 0 }
351sub key_down { } 454sub key_down { 0 }
352sub key_up { } 455sub key_up { 0 }
353 456
354sub button_down { 457sub button_down {
355 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
356 459
357 $self->focus_in; 460 $self->focus_in;
358}
359 461
360sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
361sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
362sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
363sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
364sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
365 538
366sub draw { 539sub draw {
367 my ($self) = @_; 540 my ($self) = @_;
368 541
369 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
370 553
371 glPushMatrix; 554 glPushMatrix;
372 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
373 $self->_draw;
374 glPopMatrix;
375 556
376 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
377 my ($x, $y) = @$self{qw(x y)};
378
379 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
380 glEnable GL_BLEND; 559 glEnable GL_BLEND;
381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
382 glBegin GL_QUADS; 561 glBegin GL_QUADS;
383 glVertex $x , $y;
384 glVertex $x + $self->{w}, $y;
385 glVertex $x + $self->{w}, $y + $self->{h};
386 glVertex $x , $y + $self->{h};
387 glEnd;
388 glDisable GL_BLEND;
389 }
390
391 if ($ENV{PCLIENT_DEBUG}) {
392 glPushMatrix;
393 glColor 1, 1, 0, 1;
394 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395 glBegin GL_LINE_LOOP;
396 glVertex 0 , 0; 562 glVertex 0 , 0;
397 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
398 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
399 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
400 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
401 glPopMatrix; 580 glPopMatrix;
402 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
403 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
404} 586}
405 587
406sub _draw { 588sub _draw {
407 my ($self) = @_; 589 my ($self) = @_;
408 590
409 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
410} 592}
411 593
412sub find_widget {
413 my ($self, $x, $y) = @_;
414
415 return () unless $self->{can_events};
416
417 return $self
418 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
419 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
420
421 ()
422}
423
424sub set_parent {
425 my ($self, $parent) = @_;
426
427 Scalar::Util::weaken ($self->{parent} = $parent);
428
429 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size
431 unless exists $self->{req_w};
432}
433
434sub check_size {
435 my ($self, $forced) = @_;
436
437 $self->{force_alloc} = 1 if $forced;
438 $CFClient::UI::ROOT->{check_size}{$self} = $self;
439}
440
441sub update {
442 my ($self) = @_;
443
444 $self->{parent}->update
445 if $self->{parent};
446}
447
448sub connect {
449 my ($self, $signal, $cb) = @_;
450
451 push @{ $self->{signal_cb}{$signal} }, $cb;
452}
453
454sub emit {
455 my ($self, $signal, @args) = @_;
456
457 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
458}
459
460sub DESTROY { 594sub DESTROY {
461 my ($self) = @_; 595 my ($self) = @_;
462 596
463 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
464 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
465} 601}
466 602
467############################################################################# 603#############################################################################
468 604
469package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
494 630
495 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
496 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
497 633
498 glEnable GL_BLEND; 634 glEnable GL_BLEND;
499 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
500 glColor @$color; 636 glColor_premultiply @$color;
501 637
502 glBegin GL_QUADS; 638 glBegin GL_QUADS;
503 glVertex 0 , 0; 639 glVertex 0 , 0;
504 glVertex 0 , $h; 640 glVertex 0 , $h;
505 glVertex $w, $h; 641 glVertex $w, $h;
… …
520 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
521 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
522} 658}
523 659
524sub size_request { 660sub size_request {
525 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
526} 664}
527 665
528sub draw { } 666sub draw { }
529 667
530############################################################################# 668#############################################################################
… …
534our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
535 673
536sub new { 674sub new {
537 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
538 676
539 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
540 678
541 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
542 children => [], 680 children => [],
543 can_events => 0, 681 can_events => 0,
544 %arg, 682 %arg,
545 ); 683 );
684
546 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
547 687
548 $self 688 $self
549} 689}
550 690
551sub add { 691sub add {
… …
559 $self->{children} = [ 699 $self->{children} = [
560 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
561 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
562 ]; 702 ];
563 703
564 $self->check_size (1); 704 $self->realloc;
565 $self->update;
566} 705}
567 706
568sub children { 707sub children {
569 @{ $_[0]{children} } 708 @{ $_[0]{children} }
570} 709}
… …
575 delete $child->{parent}; 714 delete $child->{parent};
576 $child->hide; 715 $child->hide;
577 716
578 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579 718
580 $self->check_size; 719 $self->realloc;
581 $self->update;
582} 720}
583 721
584sub clear { 722sub clear {
585 my ($self) = @_; 723 my ($self) = @_;
586 724
… …
590 for (@$children) { 728 for (@$children) {
591 delete $_->{parent}; 729 delete $_->{parent};
592 $_->hide; 730 $_->hide;
593 } 731 }
594 732
595 $self->check_size; 733 $self->realloc;
596 $self->update;
597} 734}
598 735
599sub find_widget { 736sub find_widget {
600 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
601 738
602 $x -= $self->{x}; 739 $x -= $self->{x};
603 $y -= $self->{y}; 740 $y -= $self->{y};
604 741
605 my $res; 742 my $res;
606 743
607 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
608 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
609 and return $res; 746 and return $res;
610 } 747 }
611 748
612 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
633} 770}
634 771
635sub add { 772sub add {
636 my ($self, $child) = @_; 773 my ($self, $child) = @_;
637 774
638 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
639
640 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
641} 777}
642 778
643sub remove { 779sub remove {
644 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
661 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
662} 798}
663 799
664############################################################################# 800#############################################################################
665 801
802# back-buffered drawing area
803
666package CFClient::UI::Window; 804package CFClient::UI::Window;
667 805
668our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
669 807
670use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
688 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
689 $self->update; 827 $self->update;
690} 828}
691 829
692sub _render { 830sub _render {
831 my ($self) = @_;
832
693 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
694} 834}
695 835
696sub render_child { 836sub render_child {
697 my ($self) = @_; 837 my ($self) = @_;
698 838
699 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
700 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
701 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
702 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
703 $self->_render; 850 $self->_render;
704 }; 851 };
705} 852}
706 853
707sub _draw { 854sub _draw {
708 my ($self) = @_; 855 my ($self) = @_;
709 856
710 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
711 858
712 my $tex = $self->{texture} 859 my $tex = $self->{texture}
713 or return; 860 or return;
714 861
715 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
717 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
718 865
719 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
720 867
721 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
722} 869}
… …
725 872
726package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
727 874
728our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
729 876
877sub new {
878 my $class = shift;
879
880 $class->SUPER::new (
881 scroll_x => 0,
882 scroll_y => 1,
883 @_,
884 )
885}
886
730sub size_request { 887sub size_request {
731 my ($self) = @_; 888 my ($self) = @_;
732 889
733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 891
736 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
737} 896}
738 897
739sub size_allocate { 898sub size_allocate {
740 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
741 900
901 my $child = $self->child;
902
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905
906 $self->child->configure (0, 0, $w, $h);
742 $self->update; 907 $self->update;
743} 908}
744 909
745sub set_offset { 910sub set_offset {
746 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
… …
780} 945}
781 946
782sub _render { 947sub _render {
783 my ($self) = @_; 948 my ($self) = @_;
784 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
785 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
786 954
787 $self->SUPER::_render; 955 $self->SUPER::_render;
788} 956}
789 957
… …
792package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
793 961
794our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
795 963
796sub new { 964sub new {
797 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
798 968
799 my $self; 969 my $self;
800 970
801 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
802 vertical => 1, 972 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 974 on_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 975 $self->{vp}->set_offset (0, $_[1]);
806 }, 976 },
807 ; 977 ;
808 978
809 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
811 slider => $slider, 981 slider => $slider,
812 @_, 982 %arg,
813 ); 983 );
814 984
815 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
818 987
819 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
995}
996
997sub update {
998 my ($self) = @_;
999
1000 $self->SUPER::update;
1001
1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005}
1006
1007sub size_allocate {
1008 my ($self, $w, $h) = @_;
1009
1010 $self->SUPER::size_allocate ($w, $h);
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
820} 1014}
821 1015
822#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 1017# update viewport offset on scroll
824 1018
… …
844 1038
845 if ($self->{bg}) { 1039 if ($self->{bg}) {
846 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
847 1041
848 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
849 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
850 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
851 1045
852 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
853 glVertex 0 , 0; 1047 glVertex 0 , 0;
854 glVertex 0 , $h; 1048 glVertex 0 , $h;
855 glVertex $w, $h; 1049 glVertex $w, $h;
… …
868 1062
869our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
870 1064
871use CFClient::OpenGL; 1065use CFClient::OpenGL;
872 1066
873my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
874 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
875 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
876 1074
877sub new { 1075sub new {
878 my $class = shift; 1076 my ($class, %arg) = @_;
879
880 # TODO: user_x, user_y, overwrite moveto?
881 1077
882 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
883 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
884 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
885 border => 0.6, 1081 border => 0.6,
886 toplevel => 1,
887 can_events => 1, 1082 can_events => 1,
888 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
889 ); 1086 );
890 1087
891 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
892 align => 0, 1089 align => 0,
893 valign => 1, 1090 valign => 1,
894 text => $self->{title}, 1091 text => $self->{title},
895 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
896 1103
897 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
898} 1113}
899 1114
900sub border { 1115sub border {
901 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
902} 1117}
903 1118
904sub size_request { 1119sub size_request {
905 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
906 1127
907 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
908 1129
909 ( 1130 (
910 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
913} 1134}
914 1135
915sub size_allocate { 1136sub size_allocate {
916 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
917 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
918 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
919 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
920 1149
921 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
922 if $self->{title};
923
924 $self->child->configure ($self->border, $self->border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
925} 1154}
926 1155
927sub button_down { 1156sub button_down {
928 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
929 1158
… …
945 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
946 1175
947 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
948 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
949 1178
950 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
951 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
952 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
953 $self->check_size; 1183 $self->realloc;
954 }; 1184 };
955 1185
956 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
957 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
958 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
960 $self->{motion} = sub { 1190 $self->{motion} = sub {
961 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
962 1192
963 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
964 1194
965 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
966 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
967 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
968 } 1203 1
969} 1204}
970 1205
971sub button_up { 1206sub button_up {
972 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
973 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
974 delete $self->{motion}; 1212 !!delete $self->{motion}
975} 1213}
976 1214
977sub mouse_motion { 1215sub mouse_motion {
978 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
979 1217
980 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
981} 1221}
982 1222
983sub _draw { 1223sub _draw {
984 my ($self) = @_; 1224 my ($self) = @_;
985 1225
1226 my $child = $self->{children}[0];
1227
986 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
987 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
988 1230
989 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991 1233
992 my $border = $self->border; 1234 my $border = $self->border;
993 1235
994 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
995 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
996 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
997 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
998 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
999 1241
1000 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1001 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
1002 1244
1003 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
1004 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
1005 my $rep_y = $ch / $bg->{h}; 1248 $bg->{t} = $ch / $bg->{h};
1006
1007 glColor @{ $self->{bg} };
1008
1009 $bg->{s} = $rep_x;
1010 $bg->{t} = $rep_y;
1011 $bg->{wrap_mode} = 1;
1012 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013 } 1250 }
1014 1251
1015 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1016 1253
1017 $self->{title}->draw if $self->{title};
1018
1019 $self->child->draw; 1254 $child->draw;
1255
1256 if ($self->{title_widget}) {
1257 glTranslate 0, $border - $self->{h};
1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1020} 1265}
1021 1266
1022############################################################################# 1267#############################################################################
1023 1268
1024package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1032sub new { 1277sub new {
1033 my $class = shift; 1278 my $class = shift;
1034 1279
1035 $class->SUPER::new ( 1280 $class->SUPER::new (
1036 col_expand => [], 1281 col_expand => [],
1037 @_ 1282 @_,
1038 ) 1283 )
1284}
1285
1286sub children {
1287 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039} 1288}
1040 1289
1041sub add { 1290sub add {
1042 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1043 1292
1044 $child->set_parent ($self); 1293 $child->set_parent ($self);
1045 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1046 1295
1047 $child->check_size; 1296 $self->realloc;
1048} 1297}
1049 1298
1050sub children { 1299sub remove {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1300 my ($self, $child) = @_;
1052}
1053 1301
1302 # TODO: not yet implemented
1303}
1304
1054# TODO: move to container class maybe? send childs a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1055sub clear { 1306sub clear {
1056 my ($self) = @_; 1307 my ($self) = @_;
1057 1308
1058 my @children = $self->children; 1309 my @children = $self->children;
1059 delete $self->{children}; 1310 delete $self->{children};
… …
1061 for (@children) { 1312 for (@children) {
1062 delete $_->{parent}; 1313 delete $_->{parent};
1063 $_->hide; 1314 $_->hide;
1064 } 1315 }
1065 1316
1066 $self->update; 1317 $self->realloc;
1067} 1318}
1068 1319
1069sub get_wh { 1320sub get_wh {
1070 my ($self) = @_; 1321 my ($self) = @_;
1071 1322
… …
1102sub size_allocate { 1353sub size_allocate {
1103 my ($self, $w, $h) = @_; 1354 my ($self, $w, $h) = @_;
1104 1355
1105 my ($ws, $hs) = $self->get_wh; 1356 my ($ws, $hs) = $self->get_wh;
1106 1357
1107 my $req_w = sum @$ws; 1358 my $req_w = (sum @$ws) || 1;
1108 my $req_h = sum @$hs; 1359 my $req_h = (sum @$hs) || 1;
1109 1360
1110 # TODO: nicer code && do row_expand 1361 # TODO: nicer code && do row_expand
1111 my @col_expand = @{$self->{col_expand}}; 1362 my @col_expand = @{$self->{col_expand}};
1112 @col_expand = (1) x @$ws unless @col_expand; 1363 @col_expand = (1) x @$ws unless @col_expand;
1113 my $col_expand = (sum @col_expand) || 1; 1364 my $col_expand = (sum @col_expand) || 1;
… …
1167 } 1418 }
1168} 1419}
1169 1420
1170############################################################################# 1421#############################################################################
1171 1422
1172package CFClient::UI::HBox; 1423package CFClient::UI::Box;
1173
1174# TODO: wrap into common Box base class
1175 1424
1176our @ISA = CFClient::UI::Container::; 1425our @ISA = CFClient::UI::Container::;
1177 1426
1178sub size_request { 1427sub size_request {
1179 my ($self) = @_; 1428 my ($self) = @_;
1180 1429
1181 my @alloc = map [$_->size_request], @{$self->{children}}; 1430 $self->{vertical}
1182 1431 ? (
1183 ( 1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1184 (List::Util::sum map $_->[0], @alloc), 1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1185 (List::Util::max map $_->[1], @alloc), 1434 )
1186 ) 1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1187} 1439}
1188 1440
1189sub size_allocate { 1441sub size_allocate {
1190 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1191 1443
1192 ($h, $w) = ($w, $h); 1444 my $space = $self->{vertical} ? $h : $w;
1193
1194 my $children = $self->{children}; 1445 my $children = $self->{children};
1195 1446
1196 my @h = map $_->{req_w}, @$children; 1447 my @req;
1197 1448
1198 my $req_h = List::Util::sum @h; 1449 if ($self->{homogeneous}) {
1199 1450 @req = ($space / (@$children || 1)) x @$children;
1200 if ($req_h > $h) {
1201 # ah well, not enough space
1202 $_ *= $h / $req_h for @h;
1203 } else { 1451 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1453 my $req = List::Util::sum @req;
1454
1455 if ($req > $space) {
1456 # ah well, not enough space
1457 $_ *= $space / $req for @req;
1458 } else {
1204 my $exp = List::Util::sum map $_->{expand}, @$children; 1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1205 $exp ||= 1;
1206 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children->[$_]{expand}
1207 for (0 .. $#$children) { 1464 for 0 .. $#$children;
1208 my $child = $children->[$_];
1209
1210 my $alloc_h = $h[$_];
1211 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1212 $h[$_] = $alloc_h;
1213 } 1465 }
1214 } 1466 }
1215 1467
1216 CFClient::UI::harmonize \@h; 1468 CFClient::UI::harmonize \@req;
1217 1469
1218 my $y = 0; 1470 my $pos = 0;
1219 for (0 .. $#$children) { 1471 for (0 .. $#$children) {
1220 my $child = $children->[$_];
1221 my $h = $h[$_]; 1472 my $alloc = $req[$_];
1222 $child->configure ($y, 0, $h, $w); 1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1223 1474
1224 $y += $h; 1475 $pos += $alloc;
1225 } 1476 }
1226 1477
1227 1 1478 1
1228} 1479}
1229 1480
1230############################################################################# 1481#############################################################################
1231 1482
1483package CFClient::UI::HBox;
1484
1485our @ISA = CFClient::UI::Box::;
1486
1487sub new {
1488 my $class = shift;
1489
1490 $class->SUPER::new (
1491 vertical => 0,
1492 @_,
1493 )
1494}
1495
1496#############################################################################
1497
1232package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1233 1499
1234# TODO: wrap into common Box base class
1235
1236our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1237 1501
1238sub size_request { 1502sub new {
1239 my ($self) = @_; 1503 my $class = shift;
1240 1504
1241 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1242 1506 vertical => 1,
1243 ( 1507 @_,
1244 (List::Util::max map $_->[0], @alloc),
1245 (List::Util::sum map $_->[1], @alloc),
1246 ) 1508 )
1247}
1248
1249sub size_allocate {
1250 my ($self, $w, $h) = @_;
1251
1252 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1253
1254 my $children = $self->{children};
1255
1256 my @h = map $_->{req_h}, @$children;
1257
1258 my $req_h = List::Util::sum @h;
1259
1260 if ($req_h > $h) {
1261 # ah well, not enough space
1262 $_ *= $h / $req_h for @h;
1263 } else {
1264 my $exp = List::Util::sum map $_->{expand}, @$children;
1265 $exp ||= 1;
1266
1267 for (0 .. $#$children) {
1268 my $child = $children->[$_];
1269
1270 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1271 }
1272 }
1273
1274 CFClient::UI::harmonize \@h;
1275
1276 my $y = 0;
1277 for (0 .. $#$children) {
1278 my $child = $children->[$_];
1279 my $h = $h[$_];
1280 $child->configure (0, $y, $w, $h);
1281
1282 $y += $h;
1283 }
1284
1285 1
1286} 1509}
1287 1510
1288############################################################################# 1511#############################################################################
1289 1512
1290package CFClient::UI::Label; 1513package CFClient::UI::Label;
… …
1307 ellipsise => 3, # end 1530 ellipsise => 3, # end
1308 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1309 fontsize => 1, 1532 fontsize => 1,
1310 align => -1, 1533 align => -1,
1311 valign => -1, 1534 valign => -1,
1312 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1313 can_events => 0, 1537 can_events => 0,
1314 %arg 1538 %arg
1315 ); 1539 );
1316 1540
1317 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1344 1568
1345 delete $self->{texture}; 1569 delete $self->{texture};
1346 $self->SUPER::update; 1570 $self->SUPER::update;
1347} 1571}
1348 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1349sub set_text { 1580sub set_text {
1350 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1351 1582
1352 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1353 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1354 1585
1355 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1356 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1357 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1358 $self->update; 1591 $self->update;
1359 $self->check_size;
1360} 1592}
1361 1593
1362sub set_markup { 1594sub set_markup {
1363 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1364 1596
… …
1368 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369 1601
1370 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1371 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1372 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1373 $self->update; 1607 $self->update;
1374 $self->check_size;
1375} 1608}
1376 1609
1377sub size_request { 1610sub size_request {
1378 my ($self) = @_; 1611 my ($self) = @_;
1379 1612
1613 $self->{size_req} ||= do {
1380 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1381 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1382 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1383 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1619
1386 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1387 1621
1388 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1389 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1390 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1391 1625
1392 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1393 1627
1394 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1395 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1396 } 1633 };
1397 1634
1398 ( 1635 @{ $self->{size_req} }
1399 $w + $self->{padding} * 2,
1400 $h + $self->{padding} * 2,
1401 )
1402} 1636}
1403 1637
1404sub size_allocate { 1638sub size_allocate {
1405 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1406 1640
1641 delete $self->{ox};
1642
1407 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1408} 1645}
1409 1646
1410sub set_fontsize { 1647sub set_fontsize {
1411 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1412 1649
1413 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1414 delete $self->{texture}; 1651 delete $self->{texture};
1415 1652
1416 $self->update; 1653 $self->realloc;
1417 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1418} 1662}
1419 1663
1420sub _draw { 1664sub _draw {
1421 my ($self) = @_; 1665 my ($self) = @_;
1422 1666
… …
1428 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1429 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1430 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1431 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1432 1676
1433 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1434 1679
1680 unless (exists $self->{ox}) {
1435 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1436 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1437 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1438 1684
1439 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1440 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1441 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1442
1443 $tex
1444 }; 1688 };
1445 1689
1446 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1448 1694
1449 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1450 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1451 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1452 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1453 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1454 } 1702 }
1455 1703
1456 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1457} 1705}
1458 1706
… …
1474 active_fg => [0, 0, 0], 1722 active_fg => [0, 0, 0],
1475 can_hover => 1, 1723 can_hover => 1,
1476 can_focus => 1, 1724 can_focus => 1,
1477 valign => 0, 1725 valign => 0,
1478 can_events => 1, 1726 can_events => 1,
1727 #text => ...
1728 #hidden => "*",
1479 @_ 1729 @_
1480 ) 1730 )
1481} 1731}
1482 1732
1483sub _set_text { 1733sub _set_text {
… …
1485 1735
1486 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1487 1737
1488 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1489 1739
1490 delete $self->{texture};
1491
1492 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1493 $self->{text} = $text; 1741 $self->{text} = $text;
1494 1742
1495 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1497 1746
1498 $self->emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1499} 1751}
1500 1752
1501sub set_text { 1753sub set_text {
1502 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1503 1755
1504 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1505 $self->_set_text ($text); 1757 $self->_set_text ($text);
1506 $self->update;
1507 $self->check_size;
1508} 1758}
1509 1759
1510sub get_text { 1760sub get_text {
1511 $_[0]{text} 1761 $_[0]{text}
1512} 1762}
… …
1515 my ($self) = @_; 1765 my ($self) = @_;
1516 1766
1517 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1518 1768
1519 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1520}
1521
1522sub size_allocate {
1523 my ($self, $w, $h) = @_;
1524
1525 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1526} 1770}
1527 1771
1528sub key_down { 1772sub key_down {
1529 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1530 1774
… …
1545 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1546 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1547 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1548 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1794 $self->_emit ('escape');
1551 } elsif ($uni) { 1795 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1553 } 1799 }
1554 1800
1555 $self->_set_text ($text); 1801 $self->_set_text ($text);
1556 $self->update; 1802
1557 $self->check_size; 1803 $self->realloc;
1804
1805 1
1558} 1806}
1559 1807
1560sub focus_in { 1808sub focus_in {
1561 my ($self) = @_; 1809 my ($self) = @_;
1562 1810
… …
1577 utf8::encode $text; 1825 utf8::encode $text;
1578 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1579 1827
1580 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1581 $self->update; 1829 $self->update;
1830
1831 1
1582} 1832}
1583 1833
1584sub mouse_motion { 1834sub mouse_motion {
1585 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1586# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 0
1587} 1839}
1588 1840
1589sub _draw { 1841sub _draw {
1590 my ($self) = @_; 1842 my ($self) = @_;
1591 1843
1592 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1593 1845
1594 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1595 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1596 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1597 } else { 1849 } else {
1598 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1599 } 1851 }
1600 1852
1601 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1603 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1604 glVertex 0 , 0; 1856 glVertex 0 , 0;
1605 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1606 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1607 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1642 if ($sym == 13) { 1894 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1645 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1899 $self->_emit (activate => $txt);
1648 $self->update; 1900 $self->update;
1649 1901
1650 } elsif ($sym == CFClient::SDLK_UP) { 1902 } elsif ($sym == CFClient::SDLK_UP) {
1651 if ($self->{history_pointer} < 0) { 1903 if ($self->{history_pointer} < 0) {
1652 $self->{history_saveback} = $self->get_text; 1904 $self->{history_saveback} = $self->get_text;
… …
1668 } else { 1920 } else {
1669 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1670 } 1922 }
1671 1923
1672 } else { 1924 } else {
1673 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1674 } 1928 1
1675
1676} 1929}
1677 1930
1678############################################################################# 1931#############################################################################
1679 1932
1680package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1689 1942
1690sub new { 1943sub new {
1691 my $class = shift; 1944 my $class = shift;
1692 1945
1693 $class->SUPER::new ( 1946 $class->SUPER::new (
1694 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1695 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1696 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1697 can_hover => 1, 1951 can_hover => 1,
1698 align => 0, 1952 align => 0,
1699 valign => 0, 1953 valign => 0,
1700 can_events => 1, 1954 can_events => 1,
1701 @_ 1955 @_
1702 ) 1956 )
1703} 1957}
1704 1958
1959sub activate { }
1960
1705sub button_up { 1961sub button_up {
1706 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1707 1963
1964 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1966 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate"); 1967
1711 } 1968 1
1712} 1969}
1713 1970
1714sub _draw { 1971sub _draw {
1715 my ($self) = @_; 1972 my ($self) = @_;
1716 1973
1717 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1718
1719 if ($GRAB == $self) {
1720 $self->{fg} = $self->{active_fg};
1721 }
1722 1975
1723 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1725 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1726 1979
… …
1731 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1732} 1985}
1733 1986
1734############################################################################# 1987#############################################################################
1735 1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
2023}
2024
2025#############################################################################
2026
1736package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1737 2028
1738our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1739 2030
1740my @tex = 2031my @tex =
… …
1745 2036
1746sub new { 2037sub new {
1747 my $class = shift; 2038 my $class = shift;
1748 2039
1749 $class->SUPER::new ( 2040 $class->SUPER::new (
1750 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1751 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1752 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1753 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1754 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1755 state => 0, 2047 state => 0,
… …
1759} 2051}
1760 2052
1761sub size_request { 2053sub size_request {
1762 my ($self) = @_; 2054 my ($self) = @_;
1763 2055
1764 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1765} 2057}
1766 2058
1767sub button_down { 2059sub button_down {
1768 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1769 2061
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1772 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1774 } 2070 1
1775} 2071}
1776 2072
1777sub _draw { 2073sub _draw {
1778 my ($self) = @_; 2074 my ($self) = @_;
1779 2075
1780 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1781 2077
1782 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1783 2079
1784 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1785 2083
1786 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1787 2085
1788 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1789 2087
… …
1944 2242
1945 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
1946 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
1947 2245
1948 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
1949 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1950 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
1951 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1952 2251
1953 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
1954 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2053 my $self = $class->SUPER::new ( 2352 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2357 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2061 vertical => 0, 2360 vertical => 0,
2062 can_hover => 1, 2361 can_hover => 1,
2063 inner_pad => 0.02, 2362 inner_pad => 0.02,
2064 @_ 2363 @_
2065 ); 2364 );
… …
2068 $self->update; 2367 $self->update;
2069 2368
2070 $self 2369 $self
2071} 2370}
2072 2371
2372sub changed { }
2373
2374sub set_range {
2375 my ($self, $range) = @_;
2376
2377 ($range, $self->{range}) = ($self->{range}, $range);
2378
2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2383}
2384
2073sub set_value { 2385sub set_value {
2074 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2075 2387
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2388 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2389
2078 $hi = $lo + 1 if $hi <= $lo; 2390 $hi = $lo + 1 if $hi <= $lo;
2079 2391
2392 $page = $hi - $lo if $page > $hi - $lo;
2393
2080 $value = $lo if $value < $lo; 2394 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2395 $value = $hi - $page if $value > $hi - $page;
2082 2396
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2397 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2398 if $unit;
2085 2399
2086 $page = $hi - $lo if $page > $hi - $lo;
2087
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2401
2090 if ($value != $old_value) { 2402 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2403 $self->_emit (changed => $value);
2092 $self->update; 2404 $self->update;
2093 } 2405 }
2094} 2406}
2095 2407
2096sub size_request { 2408sub size_request {
2097 my ($self) = @_; 2409 my ($self) = @_;
2098 2410
2099 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2100 my $h = $self->{req_h};
2101
2102 $self->{vertical} ? ($h, $w) : ($w, $h)
2103} 2412}
2104 2413
2105sub button_down { 2414sub button_down {
2106 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2107 2416
2108 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2418
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420
2109 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2110} 2422}
2111 2423
2112sub mouse_motion { 2424sub mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2114 2426
2115 if ($GRAB == $self) { 2427 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2429
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2431
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2433
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else {
2436 return 0;
2437 }
2438
2123 } 2439 1
2124} 2440}
2125 2441
2126sub update { 2442sub update {
2127 my ($self) = @_; 2443 my ($self) = @_;
2128 2444
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2445 delete $self->{knob_w};
2446 $self->SUPER::update;
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 unless ($self->{knob_w}) {
2130 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2131 2454
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2456 my $range = ($hi - $page - $lo) || 1e-100;
2133 2457
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2458 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2459
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2460 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2461 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2462
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2463 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2464 $value = $value * $self->{scale} + $self->{offset};
2140 2465
2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143 $value = 0 if $value < 0;
2144 $page = 1 - $value if $value + $page > 1;
2145
2146 $self->{knob_x} = $value; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2467 $self->{knob_w} = $knob_w;
2148 }); 2468 }
2149
2150 $self->SUPER::update;
2151}
2152
2153sub _draw {
2154 my ($self) = @_;
2155 2469
2156 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2157 2471
2158 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2159 2473
… …
2179 glDisable GL_TEXTURE_2D; 2493 glDisable GL_TEXTURE_2D;
2180} 2494}
2181 2495
2182############################################################################# 2496#############################################################################
2183 2497
2498package CFClient::UI::ValSlider;
2499
2500our @ISA = CFClient::UI::HBox::;
2501
2502sub new {
2503 my ($class, %arg) = @_;
2504
2505 my $range = delete $arg{range};
2506
2507 my $self = $class->SUPER::new (
2508 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2509 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2510 to_value => sub { shift },
2511 from_value => sub { shift },
2512 %arg,
2513 );
2514
2515 $self->{slider}->connect (changed => sub {
2516 my ($self, $value) = @_;
2517 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2518 $self->{parent}->emit (changed => $value);
2519 });
2520
2521# $self->{entry}->connect (changed => sub {
2522# my ($self, $value) = @_;
2523# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2524# $self->{parent}->emit (changed => $value);
2525# });
2526
2527 $self->add ($self->{slider}, $self->{entry});
2528
2529 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2530
2531 $self
2532}
2533
2534sub set_range { shift->{slider}->set_range (@_) }
2535sub set_value { shift->{slider}->set_value (@_) }
2536
2537#############################################################################
2538
2184package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2185 2540
2186our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2187 2542
2188use CFClient::OpenGL; 2543use CFClient::OpenGL;
2189 2544
… …
2191 my $class = shift; 2546 my $class = shift;
2192 2547
2193 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2194 fontsize => 1, 2549 fontsize => 1,
2195 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2196 #font => default_font 2552 #font => default_font
2197 @_, 2553 @_,
2198 2554
2199 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2200 par => [], 2556 par => [],
… …
2223 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2224 2580
2225 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2226 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2583 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2228 2585
2229 $self->reflow; 2586 $self->reflow;
2230} 2587}
2231 2588
2232sub text_height { 2589sub text_size {
2233 my ($self, $text, $indent) = @_; 2590 my ($self, $text, $indent) = @_;
2234 2591
2235 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2236 2593
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2239 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2240 2598
2241 ($layout->size)[1] 2599 $layout->size
2242} 2600}
2243 2601
2244sub reflow { 2602sub reflow {
2245 my ($self) = @_; 2603 my ($self) = @_;
2246 2604
2247 $self->{need_reflow}++; 2605 $self->{need_reflow}++;
2248 $self->update; 2606 $self->update;
2249} 2607}
2250 2608
2609sub set_offset {
2610 my ($self, $offset) = @_;
2611
2612 # todo: base offset on lines or so, not on pixels
2613 $self->{children}[1]->set_value ($offset);
2614}
2615
2616sub clear {
2617 my ($self) = @_;
2618
2619 $self->{par} = [];
2620 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622}
2623
2251sub add_paragraph { 2624sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2625 my ($self, $color, $text, $indent) = @_;
2253 2626
2254 #TODO: intelligently "reformat" paragraph
2255
2256 for my $line (split /\n/, $text) { 2627 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2628 my ($w, $h) = $self->text_size ($line);
2258 $self->{height} += $height; 2629 $self->{height} += $h;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260 } 2631 }
2261 2632
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2263 $self->{children}[1]->update;
2264} 2634}
2265 2635
2266sub update { 2636sub update {
2267 my ($self) = @_; 2637 my ($self) = @_;
2268 2638
… …
2270 2640
2271 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2272 2642
2273 delete $self->{texture}; 2643 delete $self->{texture};
2274 2644
2275 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647
2276 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2649 my $height = 0;
2278 2650
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2280 for @{$self->{par}}; 2655 for (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659 $layout->set_markup ($_->[4]);
2660 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3];
2662 $_->[1] = $h;
2663 }
2664
2665 $height += $_->[1];
2666 }
2281 2667
2282 $self->{height} = $height; 2668 $self->{height} = $height;
2283 2669
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285 $self->{children}[1]->update; 2671
2286
2287 delete $self->{texture}; 2672 delete $self->{texture};
2288 } 2673 }
2289 2674
2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2293 2678
2294 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2295 2680
2296 my $y0 = $top; 2681 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2682 my $y1 = $top + $H;
2298 2683
2299 my $y = 0; 2684 my $y = 0;
2300 2685
2301 my $layout = $self->{layout}; 2686 my $layout = $self->{layout};
2302 2687
2303 $layout->set_font ($self->{font}) if $self->{font}; 2688 $layout->set_font ($self->{font}) if $self->{font};
2304 2689
2305 glEnable GL_BLEND; 2690 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2693
2308 for my $par (@{$self->{par}}) { 2694 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2695 my $h = $par->[1];
2310 2696
2311 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2698 $layout->set_foreground (@{ $par->[2] });
2313 $layout->set_width ($self->{w} - $par->[2]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2314 $layout->set_markup ($par->[3]); 2701 $layout->set_markup ($par->[4]);
2315 2702
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2704
2318 glRasterPos $par->[2], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320 } 2707 }
2321 2708
2322 $y += $h; 2709 $y += $h;
2323 } 2710 }
… …
2330sub _draw { 2717sub _draw {
2331 my ($self) = @_; 2718 my ($self) = @_;
2332 2719
2333 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2336 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2338 2725
2339 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2340 2727
2341} 2728}
… …
2390 2777
2391sub new { 2778sub new {
2392 my $class = shift; 2779 my $class = shift;
2393 2780
2394 my $self = $class->SUPER::new ( 2781 my $self = $class->SUPER::new (
2395 state => 0, 2782 state => 0,
2396 connect_activate => \&toggle_flopper, 2783 on_activate => \&toggle_flopper,
2397 @_ 2784 @_
2398 ); 2785 );
2399 2786
2400 if ($self->{state}) {
2401 $self->{state} = 0;
2402 $self->toggle_flopper;
2403 }
2404
2405 $self 2787 $self
2406} 2788}
2407 2789
2408sub toggle_flopper { 2790sub toggle_flopper {
2409 my ($self) = @_; 2791 my ($self) = @_;
2410 2792
2411 # TODO: use animation 2793 $self->{other}->toggle_visibility;
2412 if ($self->{state} = !$self->{state}) {
2413 $CFClient::UI::ROOT->add ($self->{other});
2414 $self->{other}->move ($self->coord2global (0, $self->{h}));
2415 $self->emit ("open");
2416 } else {
2417 $CFClient::UI::ROOT->remove ($self->{other});
2418 $self->emit ("close");
2419 }
2420
2421 $self->emit (changed => $self->{state});
2422} 2794}
2423 2795
2424############################################################################# 2796#############################################################################
2425 2797
2426package CFClient::UI::Tooltip; 2798package CFClient::UI::Tooltip;
… …
2439} 2811}
2440 2812
2441sub set_tooltip_from { 2813sub set_tooltip_from {
2442 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2443 2815
2816 my $tooltip = $widget->{tooltip};
2817
2818 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2821 . "req $widget->{req_w} $widget->{req_h}\n"
2822 . "visible $widget->{visible}";
2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2827
2444 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2445 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2446 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2447 fontsize => 0.8, 2831 fontsize => 0.8,
2448 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2449 ellipsise => 0, 2833 ellipsise => 0,
2450 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2461 2845
2462sub size_allocate { 2846sub size_allocate {
2463 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2464 2848
2465 $self->SUPER::size_allocate ($w - 4, $h - 4); 2849 $self->SUPER::size_allocate ($w - 4, $h - 4);
2850}
2851
2852sub visibility_change {
2853 my ($self, $visible) = @_;
2854
2855 return unless $visible;
2856
2857 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner}
2859 or return;
2860
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w};
2865
2866 $self->move_abs ($x, $y);
2867 });
2466} 2868}
2467 2869
2468sub _draw { 2870sub _draw {
2469 my ($self) = @_; 2871 my ($self) = @_;
2470 2872
… …
2487 glVertex $w, $h; 2889 glVertex $w, $h;
2488 glVertex $w, 0; 2890 glVertex $w, 0;
2489 glEnd; 2891 glEnd;
2490 2892
2491 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2492 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2493} 2896}
2494 2897
2495############################################################################# 2898#############################################################################
2496 2899
… …
2502 2905
2503sub new { 2906sub new {
2504 my $class = shift; 2907 my $class = shift;
2505 2908
2506 my $self = $class->SUPER::new ( 2909 my $self = $class->SUPER::new (
2507 aspect => 1, 2910 aspect => 1,
2911 can_events => 0,
2508 @_, 2912 @_,
2509 ); 2913 );
2510 2914
2511 if ($self->{anim} && $self->{animspeed}) { 2915 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 2916 Scalar::Util::weaken (my $widget = $self);
… …
2527 2931
2528sub size_request { 2932sub size_request {
2529 (32, 8) 2933 (32, 8)
2530} 2934}
2531 2935
2936sub update {
2937 my ($self) = @_;
2938
2939 return unless $self->{visible};
2940
2941 $self->SUPER::update;
2942}
2943
2532sub _draw { 2944sub _draw {
2533 my ($self) = @_; 2945 my ($self) = @_;
2534 2946
2535 return unless $::CONN;#d# manage and cache textures differently 2947 return unless $::CONN;
2536 2948
2537 my $face; 2949 my $face;
2538 2950
2539 if ($self->{frame}) { 2951 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 2952 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2546 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2547 2959
2548 if ($tex) { 2960 if ($tex) {
2549 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2550 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2551 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2552 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2553 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2554 } 2966 }
2555} 2967}
2556 2968
2557sub DESTROY { 2969sub destroy {
2558 my ($self) = @_; 2970 my ($self) = @_;
2559 2971
2560 $self->{timer}->cancel 2972 $self->{timer}->cancel
2561 if $self->{timer}; 2973 if $self->{timer};
2562 2974
2563 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2564} 2976}
2565 2977
2566############################################################################# 2978#############################################################################
2567 2979
2568package CFClient::UI::InventoryItem; 2980package CFClient::UI::Buttonbar;
2569 2981
2570our @ISA = CFClient::UI::HBox::; 2982our @ISA = CFClient::UI::HBox::;
2571 2983
2572sub _item_to_desc { 2984# TODO: should actualyl wrap buttons and other goodies.
2573 my ($item) = @_;
2574
2575 my $desc =
2576 $item->{nrof} < 2
2577 ? $item->{name}
2578 : "$item->{nrof} × $item->{name_pl}";
2579
2580 $item->{flags} & Crossfire::Protocol::F_OPEN
2581 and $desc .= " (open)";
2582 $item->{flags} & Crossfire::Protocol::F_APPLIED
2583 and $desc .= " (applied)";
2584 $item->{flags} & Crossfire::Protocol::F_UNPAID
2585 and $desc .= " (unpaid)";
2586 $item->{flags} & Crossfire::Protocol::F_MAGIC
2587 and $desc .= " (magic)";
2588 $item->{flags} & Crossfire::Protocol::F_CURSED
2589 and $desc .= " (cursed)";
2590 $item->{flags} & Crossfire::Protocol::F_DAMNED
2591 and $desc .= " (damned)";
2592 $item->{flags} & Crossfire::Protocol::F_LOCKED
2593 and $desc .= " *";
2594
2595 $desc
2596}
2597
2598sub new {
2599 my $class = shift;
2600
2601 my %args = @_;
2602
2603 my $item = delete $args{item};
2604
2605 my $desc = _item_to_desc ($item);
2606
2607 my $self = $class->SUPER::new (
2608 can_hover => 1,
2609 can_events => 1,
2610 tooltip => ((CFClient::UI::Label::escape $desc)
2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2612 connect_button_down => sub {
2613 my ($self, $ev, $x, $y) = @_;
2614
2615 # todo: maybe put examine on 1? but should just be a tooltip :(
2616 if ($ev->{button} == 1) {
2617 my $targ = $::CONN->{player}{tag};
2618
2619 if ($item->{container} == $::CONN->{player}{tag}) {
2620 $targ = $main::OPENCONT;
2621 }
2622
2623 $::CONN->send ("move $targ $item->{tag} 0");
2624 } elsif ($ev->{button} == 2) {
2625 $::CONN->send ("apply $item->{tag}");
2626 } elsif ($ev->{button} == 3) {
2627 my @menu_items = (
2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2629 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2630 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631 (
2632 $item->{flags} & Crossfire::Protocol::F_LOCKED
2633 ? (
2634 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635 )
2636 : (
2637 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2638 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639 )
2640 ),
2641 );
2642
2643 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2644 }
2645
2646 1
2647 },
2648 %args
2649 );
2650
2651
2652 $self->add (new CFClient::UI::Face
2653 can_events => 0,
2654 face => $item->{face},
2655 anim => $item->{anim},
2656 animspeed => $item->{animspeed},
2657 );
2658
2659 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2660
2661 $self->{item} = $item;
2662
2663 $self->update_item;
2664
2665 $self
2666}
2667
2668sub update_item {
2669 my ($self) = @_;
2670
2671 my $desc = _item_to_desc ($self->{item});
2672
2673 $self->{name_lbl}->set_text ($desc);
2674}
2675
2676#############################################################################
2677
2678package CFClient::UI::Inventory;
2679
2680our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub new {
2683 my $class = shift;
2684
2685 my $self = $class->SUPER::new (
2686 scrolled => (new CFClient::UI::VBox),
2687 @_,
2688 );
2689
2690 $self
2691}
2692
2693sub set_items {
2694 my ($self, $items) = @_;
2695
2696 $self->{scrolled}->clear;
2697 return unless $items;
2698
2699 my @items = sort {
2700 ($a->{type} <=> $b->{type})
2701 or ($a->{name} cmp $b->{name})
2702 } @$items;
2703
2704 $self->{real_items} = \@items;
2705
2706 for my $item (@items) {
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2708 $item->update_item ();
2709 }
2710
2711 $self->{scrolled}->add (@items);
2712
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2714}
2715
2716sub size_request {
2717 my ($self) = @_;
2718 ($self->{req_w}, $self->{req_h});
2719}
2720 2985
2721############################################################################# 2986#############################################################################
2722 2987
2723package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2724 2989
… …
2736 ); 3001 );
2737 3002
2738 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2739 3004
2740 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2741 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2742 3007
2743 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2744 if (!ref $widget) { 3009 if (!ref $widget) {
2745 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2746 can_hover => 1, 3011 can_hover => 1,
2747 can_events => 1, 3012 can_events => 1,
2748 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2749 } 3015 }
2750 3016
2751 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2752 3018
2753 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2758 3024
2759# popup given the event (must be a mouse button down event currently) 3025# popup given the event (must be a mouse button down event currently)
2760sub popup { 3026sub popup {
2761 my ($self, $ev) = @_; 3027 my ($self, $ev) = @_;
2762 3028
2763 $self->emit ("popdown"); 3029 $self->_emit ("popdown");
2764 3030
2765 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 3032 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2768 3034
2769 $self->show; 3035 $self->show;
2770 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2771} 3037}
2772 3038
2773sub mouse_motion { 3039sub mouse_motion {
2774 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2775 3041
2776 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2777 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2778 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2779} 3047}
2780 3048
2781sub button_up { 3049sub button_up {
2782 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2783 3051
2784 if ($ev->{button} == $self->{button}) { 3052 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 3053 undef $GRAB;
2786 $self->hide; 3054 $self->hide;
2787 3055
2788 $self->emit ("popdown"); 3056 $self->_emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2790 } 3062 1
2791} 3063}
2792 3064
2793############################################################################# 3065#############################################################################
2794 3066
2795package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2796 3068
2797our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2798 3070
2799sub new { 3071sub new {
2800 my $class = shift; 3072 my $class = shift;
2801 3073
2802 $class->SUPER::new ( 3074 my $self = $class->SUPER::new (
3075 @_,
3076 );
3077
3078 $self->{current} = $self->{children}[0]
3079 if @{ $self->{children} };
3080
3081 $self
3082}
3083
3084sub add {
3085 my ($self, @widgets) = @_;
3086
3087 $self->SUPER::add (@widgets);
3088
3089 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} };
3091}
3092
3093sub set_current_page {
3094 my ($self, $page_or_widget) = @_;
3095
3096 my $widget = ref $page_or_widget
3097 ? $page_or_widget
3098 : $self->{children}[$page_or_widget];
3099
3100 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102
3103 $self->_emit (page_changed => $self->{current});
3104
3105 $self->realloc;
3106}
3107
3108sub visible_children {
3109 $_[0]{current}
3110}
3111
3112sub size_request {
3113 my ($self) = @_;
3114
3115 $self->{current}->size_request
3116}
3117
3118sub size_allocate {
3119 my ($self, $w, $h) = @_;
3120
3121 $self->{current}->configure (0, 0, $w, $h);
3122}
3123
3124sub _draw {
3125 my ($self) = @_;
3126
3127 $self->{current}->draw;
3128}
3129
3130#############################################################################
3131
3132package CFClient::UI::Notebook;
3133
3134our @ISA = CFClient::UI::VBox::;
3135
3136sub new {
3137 my $class = shift;
3138
3139 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self
3143 @_,
3144 );
3145
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148
3149 $self
3150}
3151
3152sub add {
3153 my ($self, $title, $widget, $tooltip) = @_;
3154
3155 Scalar::Util::weaken $self;
3156
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget);
3164}
3165
3166sub set_current_page {
3167 my ($self, $page) = @_;
3168
3169 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Combobox;
3176
3177use utf8;
3178
3179our @ISA = CFClient::UI::Button::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 options => [], # [value, title, longdesc], ...
3186 value => undef,
3187 @_,
3188 );
3189
3190 $self->_set_value ($self->{value});
3191
3192 $self
3193}
3194
3195sub button_down {
3196 my ($self, $ev) = @_;
3197
3198 my @menu_items;
3199
3200 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_;
3202
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 }
3205
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207}
3208
3209sub _set_value {
3210 my ($self, $value) = @_;
3211
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3213 or return;
3214
3215 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]);
3218}
3219
3220sub set_value {
3221 my ($self, $value) = @_;
3222
3223 return unless $self->{value} ne $value;
3224
3225 $self->_set_value ($value);
3226 $self->_emit (changed => $value);
3227}
3228
3229#############################################################################
3230
3231package CFClient::UI::Statusbox;
3232
3233our @ISA = CFClient::UI::VBox::;
3234
3235sub new {
3236 my $class = shift;
3237
3238 my $self = $class->SUPER::new (
2803 fontsize => 0.8, 3239 fontsize => 0.8,
2804 @_, 3240 @_,
2805 ) 3241 );
3242
3243 Scalar::Util::weaken (my $this = $self);
3244
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246
3247 $self
2806} 3248}
2807 3249
2808sub reorder { 3250sub reorder {
2809 my ($self) = @_; 3251 my ($self) = @_;
2810 my $NOW = time; 3252 my $NOW = Time::HiRes::time;
3253
3254 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} };
2811 3258
2812 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2813 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2814 } 3261 }
2815 3262
… …
2818 my @items = sort { 3265 my @items = sort {
2819 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2820 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2821 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2822 3269
3270 $self->{timer}->interval (1);
3271
2823 my $count = 10 + 1; 3272 my $count = 10 + 1;
2824 for my $item (@items) { 3273 for my $item (@items) {
2825 last unless --$count; 3274 last unless --$count;
2826 3275
2827 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2828 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2829 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2830 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2831 : $item->{text}; 3280 : $item->{text};
2832 3281
… …
2840 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2841 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2842 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2843 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2844 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2845 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2846 can_events => 1, 3295 can_events => 1,
2847 can_hover => 1 3296 can_hover => 1
2848 }; 3297 };
3298
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1;
3304 $self->{timer}->interval (1/30);
3305 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 }
3308
3309 push @widgets, $label;
2849 } 3310 }
2850 3311
2851 $self->clear; 3312 $self->clear;
2852 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2853} 3314}
… …
2856 my ($self, $text, %arg) = @_; 3317 my ($self, $text, %arg) = @_;
2857 3318
2858 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2860 3321
3322 return unless $text;
3323
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2862 3325
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 3327
2865 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2866 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2867 $item->{count}++; 3330 $item->{count}++;
2868 } else { 3331 } else {
2869 $item->{count} = 1; 3332 $item->{count} = 1;
2870 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2871 } 3334 }
2872 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2873 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2874 delete $item->{label}; 3337 delete $item->{label};
2875 } else { 3338 } else {
2876 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2877 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
2896 3359
2897 $self->reorder; 3360 $self->reorder;
2898 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2899} 3362}
2900 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2901############################################################################# 3372#############################################################################
2902 3373
2903package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
2904 3375
2905our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
2906
2907use CFClient::OpenGL;
2908 3377
2909sub new { 3378sub new {
2910 my $class = shift; 3379 my $class = shift;
2911 3380
2912 $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 });
3531}
3532
3533# $mod and $sym are the modifiers and key symbol
3534# $cmds is a array ref of strings (the commands)
3535# $cb is the callback that is executed on OK
3536# $ccb is the callback that is executed on CANCEL and
3537# when the binding was unsuccessful on OK
3538sub set_binding {
3539 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3540
3541 $self->clear_command_list;
3542 $self->{recording} = 0;
3543 $self->{rec_btn}->set_text ("start recording");
3544
3545 $self->{binding} = [$mod, $sym];
3546 $self->{commands} = $cmds;
3547
3548 $self->{binding_change} = $cb;
3549 $self->{binding_cancel} = $ccb;
3550
3551 $self->update_binding_widgets;
3552}
3553
3554# this is a shortcut method that asks for a binding
3555# and then just binds it.
3556sub do_quick_binding {
3557 my ($self, $cmds) = @_;
3558 $self->set_binding (undef, undef, $cmds, sub {
3559 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3560 });
3561 $self->ask_for_bind (1);
3562}
3563
3564sub update_binding_widgets {
3565 my ($self) = @_;
3566 my ($mod, $sym, $cmds) = $self->get_binding;
3567 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3568 $self->set_command_list ($cmds);
3569}
3570
3571sub get_binding {
3572 my ($self) = @_;
3573 return (
3574 $self->{binding}->[0],
3575 $self->{binding}->[1],
3576 [ grep { defined $_ } @{$self->{commands}} ]
3577 );
3578}
3579
3580sub clear_command_list {
3581 my ($self) = @_;
3582 $self->{cmdbox}->clear ();
3583}
3584
3585sub set_command_list {
3586 my ($self, $cmds) = @_;
3587
3588 $self->{cmdbox}->clear ();
3589 $self->{commands} = $cmds;
3590
3591 my $idx = 0;
3592
3593 for (@$cmds) {
3594 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3595
3596 my $i = $idx;
3597 $hb->add (new CFClient::UI::Label text => $_);
3598 $hb->add (new CFClient::UI::Button
3599 text => "delete",
3600 tooltip => "Deletes the action from the record",
3601 on_activate => sub {
3602 $self->{cmdbox}->remove ($hb);
3603 $cmds->[$i] = undef;
3604 });
3605
3606
3607 $idx++
3608 }
3609}
3610
3611#############################################################################
3612
3613package CFClient::UI::SpellList;
3614
3615our @ISA = CFClient::UI::Table::;
3616
3617sub new {
3618 my $class = shift;
3619
3620 my $self = $class->SUPER::new (
3621 binding => [],
3622 commands => [],
2913 @_, 3623 @_,
2914 ) 3624 )
2915} 3625}
2916 3626
2917sub configure { 3627my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2918 my ($self, $x, $y, $w, $h) = @_;
2919 3628
2920 $self->{w} = $w; 3629my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2921 $self->{h} = $h; 3630 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2922} 3631my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3635my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3637my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3638 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2923 3639
2924sub check_size { 3640sub rebuild_spell_list {
3641 my ($self) = @_;
3642
3643 $CFClient::UI::ROOT->on_refresh ($self => sub {
3644 $self->clear;
3645
3646 return unless $::CONN;
3647
3648 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3649 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3650 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3651 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3652 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3653
3654 my $row = 0;
3655
3656 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3657 my $spell = $self->{spell}{$_};
3658
3659 $row++;
3660
3661 my $spell_cb = sub {
3662 my ($widget, $ev) = @_;
3663
3664 if ($ev->{button} == 1) {
3665 $::CONN->user_send ("cast $spell->{name}");
3666 } elsif ($ev->{button} == 2) {
3667 $::CONN->user_send ("invoke $spell->{name}");
3668 } elsif ($ev->{button} == 3) {
3669 (new CFClient::UI::Menu
3670 items => [
3671 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3672 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3673 ],
3674 )->popup ($ev);
3675 } else {
3676 return 0;
3677 }
3678
3679 1
3680 };
3681
3682 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3683
3684 #TODO: add path info to tooltip
3685 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3686
3687 $self->add (0, $row, new CFClient::UI::Face
3688 face => $spell->{face},
3689 can_hover => 1,
3690 can_events => 1,
3691 tooltip => $tooltip,
3692 on_button_down => $spell_cb,
3693 );
3694
3695 $self->add (1, $row, new CFClient::UI::Label
3696 expand => 1,
3697 text => $spell->{name},
3698 can_hover => 1,
3699 can_events => 1,
3700 tooltip => $tooltip,
3701 on_button_down => $spell_cb,
3702 );
3703
3704 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3705 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3706 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3707 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3708 }
3709 });
3710}
3711
3712sub add_spell {
2925 my ($self) = @_; 3713 my ($self, $spell) = @_;
2926 3714
2927 $self->size_allocate ($self->{w}, $self->{h}) 3715 $self->{spell}->{$spell->{name}} = $spell;
2928 if $self->{w}; 3716 $self->rebuild_spell_list;
3717}
3718
3719sub remove_spell {
3720 my ($self, $spell) = @_;
3721
3722 delete $self->{spell}->{$spell->{name}};
3723 $self->rebuild_spell_list;
3724}
3725
3726sub clear_spells {
3727 my ($self) = @_;
3728
3729 $self->{spell} = {};
3730 $self->rebuild_spell_list;
3731}
3732
3733#############################################################################
3734
3735package CFClient::UI::Root;
3736
3737our @ISA = CFClient::UI::Container::;
3738
3739use List::Util qw(min max);
3740
3741use CFClient::OpenGL;
3742
3743sub new {
3744 my $class = shift;
3745
3746 my $self = $class->SUPER::new (
3747 visible => 1,
3748 @_,
3749 );
3750
3751 Scalar::Util::weaken ($self->{root} = $self);
3752
3753 $self
2929} 3754}
2930 3755
2931sub size_request { 3756sub size_request {
2932 my ($self) = @_; 3757 my ($self) = @_;
2933 3758
2934 ($self->{w}, $self->{h}) 3759 ($self->{w}, $self->{h})
3760}
3761
3762sub _to_pixel {
3763 my ($coord, $size, $max) = @_;
3764
3765 $coord =
3766 $coord eq "center" ? ($max - $size) * 0.5
3767 : $coord eq "max" ? $max
3768 : $coord;
3769
3770 $coord = 0 if $coord < 0;
3771 $coord = $max - $size if $coord > $max - $size;
3772
3773 int $coord + 0.5
2935} 3774}
2936 3775
2937sub size_allocate { 3776sub size_allocate {
2938 my ($self, $w, $h) = @_; 3777 my ($self, $w, $h) = @_;
2939 3778
2940 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2942
2943 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2944 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2945
2946 for my $child ($self->children) { 3779 for my $child ($self->children) {
2947 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3780 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948 3781
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3782 $X = $child->{force_x} if exists $child->{force_x};
2950 if exists $child->{req_x}; 3783 $Y = $child->{force_y} if exists $child->{force_y};
2951 3784
2952 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3785 $X = _to_pixel $X, $W, $self->{w};
2953 if exists $child->{req_y}; 3786 $Y = _to_pixel $Y, $H, $self->{h};
2954
2955 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2956 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2957 3787
2958 $child->configure ($X, $Y, $W, $H); 3788 $child->configure ($X, $Y, $W, $H);
2959 } 3789 }
2960} 3790}
2961 3791
… …
2972} 3802}
2973 3803
2974sub update { 3804sub update {
2975 my ($self) = @_; 3805 my ($self) = @_;
2976 3806
2977 $self->check_size;
2978 $::WANT_REFRESH++; 3807 $::WANT_REFRESH++;
2979} 3808}
2980 3809
2981sub add { 3810sub add {
2982 my ($self, @children) = @_; 3811 my ($self, @children) = @_;
2983 3812
2984 for my $child (@children) {
2985 $child->{toplevel} = 1; 3813 $_->{is_toplevel} = 1
2986 3814 for @children;
2987 # integerise window positions
2988 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y};
2990 }
2991 3815
2992 $self->SUPER::add (@children); 3816 $self->SUPER::add (@children);
3817}
3818
3819sub remove {
3820 my ($self, @children) = @_;
3821
3822 $self->SUPER::remove (@children);
3823
3824 delete $self->{is_toplevel}
3825 for @children;
3826
3827 while (@children) {
3828 my $w = pop @children;
3829 push @children, $w->children;
3830 $w->set_invisible;
3831 }
2993} 3832}
2994 3833
2995sub on_refresh { 3834sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3835 my ($self, $id, $cb) = @_;
2997 3836
… …
3010 while ($self->{refresh_hook}) { 3849 while ($self->{refresh_hook}) {
3011 $_->() 3850 $_->()
3012 for values %{delete $self->{refresh_hook}}; 3851 for values %{delete $self->{refresh_hook}};
3013 } 3852 }
3014 3853
3015 if ($self->{check_size}) { 3854 if ($self->{realloc}) {
3016 my @queue = ([], []); 3855 my %queue;
3856 my @queue;
3857 my $widget;
3017 3858
3018 for (;;) { 3859 outer:
3019 if ($self->{check_size}) { 3860 while () {
3020 # heuristic: check containers last 3861 if (my $realloc = delete $self->{realloc}) {
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3862 for $widget (values %$realloc) {
3022 for values %{delete $self->{check_size}} 3863 $widget->{visible} or next; # do not resize invisible widgets
3864
3865 $queue{$widget+0}++ and next; # duplicates are common
3866
3867 push @{ $queue[$widget->{visible}] }, $widget;
3868 }
3023 } 3869 }
3024 3870
3025 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3871 while () {
3872 @queue or last outer;
3026 3873
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3874 $widget = pop @{ $queue[-1] || [] }
3028 ? @$widget{qw(user_w user_h)} 3875 and last;
3029 : $widget->size_request;
3030
3031 if (delete $widget->{force_alloc}
3032 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3033 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3034 3876
3877 pop @queue;
3878 }
3879
3880 delete $queue{$widget+0};
3881
3882 my ($w, $h) = $widget->size_request;
3883
3884 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3885 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3886
3887 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3888 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3889
3890 $w = $widget->{force_w} if exists $widget->{force_w};
3891 $h = $widget->{force_h} if exists $widget->{force_h};
3892
3893 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3894 || delete $widget->{force_realloc}) {
3035 $widget->{req_w} = $w; 3895 $widget->{req_w} = $w;
3036 $widget->{req_h} = $h; 3896 $widget->{req_h} = $h;
3037 3897
3038 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3898 $self->{size_alloc}{$widget+0} = $widget;
3039 3899
3040 $widget->{parent}->check_size
3041 if $widget->{parent}; 3900 if (my $parent = $widget->{parent}) {
3901 $self->{realloc}{$parent+0} = $parent
3902 unless $queue{$parent+0};
3903
3904 $parent->{force_size_alloc} = 1;
3905 $self->{size_alloc}{$parent+0} = $parent;
3906 }
3042 } 3907 }
3908
3909 delete $self->{realloc}{$widget+0};
3043 } 3910 }
3044 } 3911 }
3045 3912
3046 while ($self->{size_alloc}) { 3913 while (my $size_alloc = delete $self->{size_alloc}) {
3047 for (values %{delete $self->{size_alloc}}) { 3914 my @queue = sort { $b->{visible} <=> $a->{visible} }
3048 my ($widget, $w, $h) = @$_; 3915 values %$size_alloc;
3916
3917 while () {
3918 my $widget = pop @queue || last;
3919
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3049 3921
3050 $w = 0 if $w < 0; 3922 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3923 $h = 0 if $h < 0;
3052 3924
3925 $w = int $w + 0.5;
3926 $h = int $h + 0.5;
3927
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w};
3930 $widget->{old_h} = $widget->{h};
3931
3053 $widget->{w} = $w; 3932 $widget->{w} = $w;
3054 $widget->{h} = $h; 3933 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h); 3934
3056 $widget->emit (size_allocate => $w, $h); 3935 $widget->emit (size_allocate => $w, $h);
3936 }
3057 } 3937 }
3058 } 3938 }
3059 3939
3060 while ($self->{post_alloc_hook}) { 3940 while ($self->{post_alloc_hook}) {
3061 $_->() 3941 $_->()
3062 for values %{delete $self->{post_alloc_hook}}; 3942 for values %{delete $self->{post_alloc_hook}};
3063 } 3943 }
3944
3064 3945
3065 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3946 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3947 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3067 glClear GL_COLOR_BUFFER_BIT; 3948 glClear GL_COLOR_BUFFER_BIT;
3068 3949
… …
3070 glLoadIdentity; 3951 glLoadIdentity;
3071 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3072 glMatrixMode GL_MODELVIEW; 3953 glMatrixMode GL_MODELVIEW;
3073 glLoadIdentity; 3954 glLoadIdentity;
3074 3955
3956 {
3957 package CFClient::UI::Base;
3958
3959 ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h});
3961 }
3962
3075 $self->_draw; 3963 $self->_draw;
3076} 3964}
3077 3965
3078############################################################################# 3966#############################################################################
3079 3967

Diff Legend

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