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.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.304 by elmex, Tue Jun 13 11:01:04 2006 UTC

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

Diff Legend

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