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.217 by root, Fri May 19 23:18:42 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) = @_;
… …
136 $rem += $_ - $i; 150 $rem += $_ - $i;
137 $_ = $i; 151 $_ = $i;
138 } 152 }
139} 153}
140 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
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
141# call when resolution changes etc. 171# call when resolution changes etc.
142sub rescale_widgets { 172sub rescale_widgets {
143 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
144 174
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 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
150 $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.]+$/;
151 $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};
152 $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};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $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.]+$/;
155 $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};
156 $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};
157 $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
158 } 190 }
159
160 $widget->reconfigure;
161 } 191 }
192
193 reconfigure_widgets;
162} 194}
163 195
164############################################################################# 196#############################################################################
165 197
166package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
171 203
172sub new { 204sub new {
173 my $class = shift; 205 my $class = shift;
174 206
175 my $self = bless { 207 my $self = bless {
176 x => 0, 208 x => "center",
177 y => 0, 209 y => "center",
178 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
179 can_events => 1, 213 can_events => 1,
180 @_ 214 @_
181 }, $class; 215 }, $class;
182 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
183 for (keys %$self) { 219 for (keys %$self) {
184 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
186 } 222 }
187 } 223 }
188 224
189 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 }
190 236
191 $self 237 $self
192} 238}
193 239
194sub destroy { 240sub destroy {
… …
204 return if $self->{parent}; 250 return if $self->{parent};
205 251
206 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
207} 253}
208 254
209sub hide { 255sub set_visible {
210 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};
211 279
212 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
214 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
215 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
216 if $self->{parent}; 314 if $self->{parent};
217} 315}
218 316
219sub move { 317sub move_abs {
220 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
221 319
222 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
223 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
224 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
225 323
226 $self->update; 324 $self->update;
227} 325}
228 326
229sub set_size { 327sub set_size {
230 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
231 329
232 $self->{user_w} = $w; 330 $self->{force_w} = $w;
233 $self->{user_h} = $h; 331 $self->{force_h} = $h;
234 332
235 $self->check_size; 333 $self->realloc;
236} 334}
237 335
238sub size_request { 336sub size_request {
239 require Carp; 337 require Carp;
240 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
242 340
243sub configure { 341sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
245 343
246 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
249 349
250 # use alignment to adjust x, y 350 # use alignment to adjust x, y
251 351
252 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 354 }
257 355
258 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 357 $self->{x} = $x;
260 $self->{y} = $y; 358 $self->{y} = $y;
261 $self->update; 359 $self->update;
262 } 360 }
263 361
264 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $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;
266 } 369 }
267} 370}
268 371
269sub size_allocate { 372sub size_allocate {
270 # nothing to be done 373 # nothing to be done
271} 374}
272 375
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
281} 382}
282 383
283sub set_max_size { 384sub set_max_size {
284 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
285 386
286 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
288} 391}
289 392
290sub set_tooltip { 393sub set_tooltip {
291 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
292 395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
293 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
294 402
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
298 } 406 }
299} 407}
300 408
301# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
302sub coord2local { 410sub coord2local {
… …
318 return if $FOCUS == $self; 426 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
320 428
321 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
322 430
323 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
324 432
325 $focus->update if $focus; 433 $focus->update if $focus;
326 $FOCUS->update; 434 $FOCUS->update;
327} 435}
328 436
… …
331 439
332 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
333 441
334 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
335 443
336 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
337 445
338 $focus->update if $focus; #? 446 $focus->update if $focus; #?
339}
340 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
341sub mouse_motion { } 452sub mouse_motion { 0 }
342sub button_up { } 453sub button_up { 0 }
343sub key_down { } 454sub key_down { 0 }
344sub key_up { } 455sub key_up { 0 }
345 456
346sub button_down { 457sub button_down {
347 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
348 459
349 $self->focus_in; 460 $self->focus_in;
350}
351 461
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
356sub 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
357 538
358sub draw { 539sub draw {
359 my ($self) = @_; 540 my ($self) = @_;
360 541
361 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);
362 553
363 glPushMatrix; 554 glPushMatrix;
364 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
365 $self->_draw;
366 glPopMatrix;
367 556
368 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
369 my ($x, $y) = @$self{qw(x y)};
370
371 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
372 glEnable GL_BLEND; 559 glEnable GL_BLEND;
373 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
374 glBegin GL_QUADS; 561 glBegin GL_QUADS;
375 glVertex $x , $y;
376 glVertex $x + $self->{w}, $y;
377 glVertex $x + $self->{w}, $y + $self->{h};
378 glVertex $x , $y + $self->{h};
379 glEnd;
380 glDisable GL_BLEND;
381 }
382
383 if ($ENV{PCLIENT_DEBUG}) {
384 glPushMatrix;
385 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 562 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
390 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
391 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
392 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;
393 glPopMatrix; 580 glPopMatrix;
394 #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;
395 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
396} 586}
397 587
398sub _draw { 588sub _draw {
399 my ($self) = @_; 589 my ($self) = @_;
400 590
401 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
402} 592}
403 593
404sub find_widget {
405 my ($self, $x, $y) = @_;
406
407 return () unless $self->{can_events};
408
409 return $self
410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413 ()
414}
415
416sub set_parent {
417 my ($self, $parent) = @_;
418
419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424}
425
426sub check_size {
427 my ($self, $forced) = @_;
428
429 $self->{force_alloc} = 1 if $forced;
430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
431}
432
433sub update {
434 my ($self) = @_;
435
436 $self->{parent}->update
437 if $self->{parent};
438}
439
440sub connect {
441 my ($self, $signal, $cb) = @_;
442
443 push @{ $self->{signal_cb}{$signal} }, $cb;
444}
445
446sub emit {
447 my ($self, $signal, @args) = @_;
448
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450}
451
452sub DESTROY { 594sub DESTROY {
453 my ($self) = @_; 595 my ($self) = @_;
454 596
455 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
456 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
457} 601}
458 602
459############################################################################# 603#############################################################################
460 604
461package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
486 630
487 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
488 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
489 633
490 glEnable GL_BLEND; 634 glEnable GL_BLEND;
491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
492 glColor @$color; 636 glColor_premultiply @$color;
493 637
494 glBegin GL_QUADS; 638 glBegin GL_QUADS;
495 glVertex 0 , 0; 639 glVertex 0 , 0;
496 glVertex 0 , $h; 640 glVertex 0 , $h;
497 glVertex $w, $h; 641 glVertex $w, $h;
… …
512 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
514} 658}
515 659
516sub size_request { 660sub size_request {
517 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
518} 664}
519 665
520sub draw { } 666sub draw { }
521 667
522############################################################################# 668#############################################################################
… …
526our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
527 673
528sub new { 674sub new {
529 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
530 676
531 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
532 678
533 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
534 children => [], 680 children => [],
535 can_events => 0, 681 can_events => 0,
536 %arg, 682 %arg,
537 ); 683 );
684
538 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
539 687
540 $self 688 $self
541} 689}
542 690
543sub add { 691sub add {
… …
551 $self->{children} = [ 699 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
554 ]; 702 ];
555 703
556 $self->check_size (1); 704 $self->realloc;
557 $self->update;
558} 705}
559 706
560sub children { 707sub children {
561 @{ $_[0]{children} } 708 @{ $_[0]{children} }
562} 709}
… …
567 delete $child->{parent}; 714 delete $child->{parent};
568 $child->hide; 715 $child->hide;
569 716
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 718
572 $self->check_size; 719 $self->realloc;
573 $self->update;
574} 720}
575 721
576sub clear { 722sub clear {
577 my ($self) = @_; 723 my ($self) = @_;
578 724
… …
582 for (@$children) { 728 for (@$children) {
583 delete $_->{parent}; 729 delete $_->{parent};
584 $_->hide; 730 $_->hide;
585 } 731 }
586 732
587 $self->check_size; 733 $self->realloc;
588 $self->update;
589} 734}
590 735
591sub find_widget { 736sub find_widget {
592 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
593 738
594 $x -= $self->{x}; 739 $x -= $self->{x};
595 $y -= $self->{y}; 740 $y -= $self->{y};
596 741
597 my $res; 742 my $res;
598 743
599 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
600 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
601 and return $res; 746 and return $res;
602 } 747 }
603 748
604 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
625} 770}
626 771
627sub add { 772sub add {
628 my ($self, $child) = @_; 773 my ($self, $child) = @_;
629 774
630 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
631
632 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
633} 777}
634 778
635sub remove { 779sub remove {
636 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
653 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
654} 798}
655 799
656############################################################################# 800#############################################################################
657 801
802# back-buffered drawing area
803
658package CFClient::UI::Window; 804package CFClient::UI::Window;
659 805
660our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
661 807
662use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
680 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 827 $self->update;
682} 828}
683 829
684sub _render { 830sub _render {
831 my ($self) = @_;
832
685 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
686} 834}
687 835
688sub render_child { 836sub render_child {
689 my ($self) = @_; 837 my ($self) = @_;
690 838
691 $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 {
692 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
694 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
695 $self->_render; 850 $self->_render;
696 }; 851 };
697} 852}
698 853
699sub _draw { 854sub _draw {
700 my ($self) = @_; 855 my ($self) = @_;
701 856
702 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
703 858
704 my $tex = $self->{texture} 859 my $tex = $self->{texture}
705 or return; 860 or return;
706 861
707 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
709 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
710 865
711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
712 867
713 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
714} 869}
… …
717 872
718package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
719 874
720our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
721 876
877sub new {
878 my $class = shift;
879
880 $class->SUPER::new (
881 scroll_x => 0,
882 scroll_y => 1,
883 @_,
884 )
885}
886
722sub size_request { 887sub size_request {
723 my ($self) = @_; 888 my ($self) = @_;
724 889
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 891
728 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
729} 896}
730 897
731sub size_allocate { 898sub size_allocate {
732 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 907 $self->update;
735} 908}
736 909
737sub set_offset { 910sub set_offset {
738 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
… …
772} 945}
773 946
774sub _render { 947sub _render {
775 my ($self) = @_; 948 my ($self) = @_;
776 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
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778 954
779 $self->SUPER::_render; 955 $self->SUPER::_render;
780} 956}
781 957
… …
784package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
785 961
786our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
787 963
788sub new { 964sub new {
789 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
790 968
791 my $self; 969 my $self;
792 970
793 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
794 vertical => 1, 972 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 974 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 975 $self->{vp}->set_offset (0, $_[1]);
798 }, 976 },
799 ; 977 ;
800 978
801 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 981 slider => $slider,
804 @_, 982 %arg,
805 ); 983 );
806 984
807 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
810 987
811 $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]);
812} 1014}
813 1015
814#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 1017# update viewport offset on scroll
816 1018
… …
836 1038
837 if ($self->{bg}) { 1039 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
839 1041
840 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
842 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
843 1045
844 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
845 glVertex 0 , 0; 1047 glVertex 0 , 0;
846 glVertex 0 , $h; 1048 glVertex 0 , $h;
847 glVertex $w, $h; 1049 glVertex $w, $h;
… …
860 1062
861our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
862 1064
863use CFClient::OpenGL; 1065use CFClient::OpenGL;
864 1066
865my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 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);
868 1074
869sub new { 1075sub new {
870 my $class = shift; 1076 my ($class, %arg) = @_;
871
872 # TODO: user_x, user_y, overwrite moveto?
873 1077
874 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1081 border => 0.6,
878 toplevel => 1,
879 can_events => 1, 1082 can_events => 1,
880 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
881 ); 1086 );
882 1087
883 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
884 align => 0, 1089 align => 0,
885 valign => 1, 1090 valign => 1,
886 text => $self->{title}, 1091 text => $self->{title},
887 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 }
888 1103
889 $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};
890} 1113}
891 1114
892sub border { 1115sub border {
893 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
894} 1117}
895 1118
896sub size_request { 1119sub size_request {
897 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};
898 1127
899 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
900 1129
901 ( 1130 (
902 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
905} 1134}
906 1135
907sub size_allocate { 1136sub size_allocate {
908 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
909 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
910 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
911 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
912 1149
913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
914 if $self->{title};
915
916 $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};
917} 1154}
918 1155
919sub button_down { 1156sub button_down {
920 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
921 1158
… …
937 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
938 1175
939 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
941 1178
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size; 1183 $self->realloc;
946 }; 1184 };
947 1185
948 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1190 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
954 1192
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
956 1194
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
959 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
960 } 1203 1
961} 1204}
962 1205
963sub button_up { 1206sub button_up {
964 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
965 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
966 delete $self->{motion}; 1212 !!delete $self->{motion}
967} 1213}
968 1214
969sub mouse_motion { 1215sub mouse_motion {
970 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
971 1217
972 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
973} 1221}
974 1222
975sub _draw { 1223sub _draw {
976 my ($self) = @_; 1224 my ($self) = @_;
977 1225
1226 my $child = $self->{children}[0];
1227
978 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
980 1230
981 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1233
984 my $border = $self->border; 1234 my $border = $self->border;
985 1235
986 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1241
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
994 1244
995 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1248 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1250 }
1006 1251
1007 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1008 1253
1009 $self->{title}->draw if $self->{title};
1010
1011 $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};
1012} 1265}
1013 1266
1014############################################################################# 1267#############################################################################
1015 1268
1016package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1024sub new { 1277sub new {
1025 my $class = shift; 1278 my $class = shift;
1026 1279
1027 $class->SUPER::new ( 1280 $class->SUPER::new (
1028 col_expand => [], 1281 col_expand => [],
1029 @_ 1282 @_,
1030 ) 1283 )
1284}
1285
1286sub children {
1287 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1288}
1032 1289
1033sub add { 1290sub add {
1034 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1035 1292
1036 $child->set_parent ($self); 1293 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1038 1295
1039 $child->check_size; 1296 $self->realloc;
1040} 1297}
1041 1298
1042sub children { 1299sub remove {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1300 my ($self, $child) = @_;
1044}
1045 1301
1302 # TODO: not yet implemented
1303}
1304
1046# 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?
1047sub clear { 1306sub clear {
1048 my ($self) = @_; 1307 my ($self) = @_;
1049 1308
1050 my @children = $self->children; 1309 my @children = $self->children;
1051 delete $self->{children}; 1310 delete $self->{children};
… …
1053 for (@children) { 1312 for (@children) {
1054 delete $_->{parent}; 1313 delete $_->{parent};
1055 $_->hide; 1314 $_->hide;
1056 } 1315 }
1057 1316
1058 $self->update; 1317 $self->realloc;
1059} 1318}
1060 1319
1061sub get_wh { 1320sub get_wh {
1062 my ($self) = @_; 1321 my ($self) = @_;
1063 1322
… …
1094sub size_allocate { 1353sub size_allocate {
1095 my ($self, $w, $h) = @_; 1354 my ($self, $w, $h) = @_;
1096 1355
1097 my ($ws, $hs) = $self->get_wh; 1356 my ($ws, $hs) = $self->get_wh;
1098 1357
1099 my $req_w = sum @$ws; 1358 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1359 my $req_h = (sum @$hs) || 1;
1101 1360
1102 # TODO: nicer code && do row_expand 1361 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1362 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1363 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1364 my $col_expand = (sum @col_expand) || 1;
… …
1159 } 1418 }
1160} 1419}
1161 1420
1162############################################################################# 1421#############################################################################
1163 1422
1164package CFClient::UI::HBox; 1423package CFClient::UI::Box;
1165
1166# TODO: wrap into common Box base class
1167 1424
1168our @ISA = CFClient::UI::Container::; 1425our @ISA = CFClient::UI::Container::;
1169 1426
1170sub size_request { 1427sub size_request {
1171 my ($self) = @_; 1428 my ($self) = @_;
1172 1429
1173 my @alloc = map [$_->size_request], @{$self->{children}}; 1430 $self->{vertical}
1174 1431 ? (
1175 ( 1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1176 (List::Util::sum map $_->[0], @alloc), 1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1177 (List::Util::max map $_->[1], @alloc), 1434 )
1178 ) 1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1179} 1439}
1180 1440
1181sub size_allocate { 1441sub size_allocate {
1182 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1183 1443
1184 ($h, $w) = ($w, $h); 1444 my $space = $self->{vertical} ? $h : $w;
1185
1186 my $children = $self->{children}; 1445 my $children = $self->{children};
1187 1446
1188 my @h = map $_->{req_w}, @$children; 1447 my @req;
1189 1448
1190 my $req_h = List::Util::sum @h; 1449 if ($self->{homogeneous}) {
1191 1450 @req = ($space / (@$children || 1)) x @$children;
1192 if ($req_h > $h) {
1193 # ah well, not enough space
1194 $_ *= $h / $req_h for @h;
1195 } 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 {
1196 my $exp = List::Util::sum map $_->{expand}, @$children; 1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1197 $exp ||= 1;
1198 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children->[$_]{expand}
1199 for (0 .. $#$children) { 1464 for 0 .. $#$children;
1200 my $child = $children->[$_];
1201
1202 my $alloc_h = $h[$_];
1203 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204 $h[$_] = $alloc_h;
1205 } 1465 }
1206 } 1466 }
1207 1467
1208 CFClient::UI::harmonize \@h; 1468 CFClient::UI::harmonize \@req;
1209 1469
1210 my $y = 0; 1470 my $pos = 0;
1211 for (0 .. $#$children) { 1471 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_]; 1472 my $alloc = $req[$_];
1214 $child->configure ($y, 0, $h, $w); 1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1215 1474
1216 $y += $h; 1475 $pos += $alloc;
1217 } 1476 }
1218 1477
1219 1 1478 1
1220} 1479}
1221 1480
1222############################################################################# 1481#############################################################################
1223 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
1224package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1225 1499
1226# TODO: wrap into common Box base class
1227
1228our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1229 1501
1230sub size_request { 1502sub new {
1231 my ($self) = @_; 1503 my $class = shift;
1232 1504
1233 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1234 1506 vertical => 1,
1235 ( 1507 @_,
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1508 )
1239}
1240
1241sub size_allocate {
1242 my ($self, $w, $h) = @_;
1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246 my $children = $self->{children};
1247
1248 my @h = map $_->{req_h}, @$children;
1249
1250 my $req_h = List::Util::sum @h;
1251
1252 if ($req_h > $h) {
1253 # ah well, not enough space
1254 $_ *= $h / $req_h for @h;
1255 } else {
1256 my $exp = List::Util::sum map $_->{expand}, @$children;
1257 $exp ||= 1;
1258
1259 for (0 .. $#$children) {
1260 my $child = $children->[$_];
1261
1262 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263 }
1264 }
1265
1266 CFClient::UI::harmonize \@h;
1267
1268 my $y = 0;
1269 for (0 .. $#$children) {
1270 my $child = $children->[$_];
1271 my $h = $h[$_];
1272 $child->configure (0, $y, $w, $h);
1273
1274 $y += $h;
1275 }
1276
1277 1
1278} 1509}
1279 1510
1280############################################################################# 1511#############################################################################
1281 1512
1282package CFClient::UI::Label; 1513package CFClient::UI::Label;
… …
1299 ellipsise => 3, # end 1530 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1301 fontsize => 1, 1532 fontsize => 1,
1302 align => -1, 1533 align => -1,
1303 valign => -1, 1534 valign => -1,
1304 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1305 can_events => 0, 1537 can_events => 0,
1306 %arg 1538 %arg
1307 ); 1539 );
1308 1540
1309 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1336 1568
1337 delete $self->{texture}; 1569 delete $self->{texture};
1338 $self->SUPER::update; 1570 $self->SUPER::update;
1339} 1571}
1340 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1341sub set_text { 1580sub set_text {
1342 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1343 1582
1344 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1345 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1346 1585
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1349 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1350 $self->update; 1591 $self->update;
1351 $self->check_size;
1352} 1592}
1353 1593
1354sub set_markup { 1594sub set_markup {
1355 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1356 1596
… …
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1601
1362 $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;
1363 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1364 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1365 $self->update; 1607 $self->update;
1366 $self->check_size;
1367} 1608}
1368 1609
1369sub size_request { 1610sub size_request {
1370 my ($self) = @_; 1611 my ($self) = @_;
1371 1612
1613 $self->{size_req} ||= do {
1372 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1373 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1619
1378 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1379 1621
1380 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1381 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1382 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1383 1625
1384 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1385 1627
1386 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1388 } 1633 };
1389 1634
1390 ( 1635 @{ $self->{size_req} }
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1636}
1395 1637
1396sub size_allocate { 1638sub size_allocate {
1397 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1398 1640
1641 delete $self->{ox};
1642
1399 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1645}
1401 1646
1402sub set_fontsize { 1647sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1404 1649
1405 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1651 delete $self->{texture};
1407 1652
1408 $self->update; 1653 $self->realloc;
1409 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1410} 1662}
1411 1663
1412sub _draw { 1664sub _draw {
1413 my ($self) = @_; 1665 my ($self) = @_;
1414 1666
… …
1420 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 1676
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1426 1679
1680 unless (exists $self->{ox}) {
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1429 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1430 1684
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1433 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1436 }; 1688 };
1437 1689
1438 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1439 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};
1440 1694
1441 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1442 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1444 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1446 } 1702 }
1447 1703
1448 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1449} 1705}
1450 1706
… …
1466 active_fg => [0, 0, 0], 1722 active_fg => [0, 0, 0],
1467 can_hover => 1, 1723 can_hover => 1,
1468 can_focus => 1, 1724 can_focus => 1,
1469 valign => 0, 1725 valign => 0,
1470 can_events => 1, 1726 can_events => 1,
1727 #text => ...
1728 #hidden => "*",
1471 @_ 1729 @_
1472 ) 1730 )
1473} 1731}
1474 1732
1475sub _set_text { 1733sub _set_text {
… …
1477 1735
1478 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1479 1737
1480 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1481 1739
1482 delete $self->{texture};
1483
1484 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1485 $self->{text} = $text; 1741 $self->{text} = $text;
1486 1742
1487 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1489 1746
1490 $self->emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1491} 1751}
1492 1752
1493sub set_text { 1753sub set_text {
1494 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1495 1755
1496 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 1757 $self->_set_text ($text);
1498 $self->update;
1499 $self->check_size;
1500} 1758}
1501 1759
1502sub get_text { 1760sub get_text {
1503 $_[0]{text} 1761 $_[0]{text}
1504} 1762}
… …
1507 my ($self) = @_; 1765 my ($self) = @_;
1508 1766
1509 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1510 1768
1511 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518} 1770}
1519 1771
1520sub key_down { 1772sub key_down {
1521 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1522 1774
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1794 $self->_emit ('escape');
1543 } elsif ($uni) { 1795 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1545 } 1799 }
1546 1800
1547 $self->_set_text ($text); 1801 $self->_set_text ($text);
1548 $self->update; 1802
1549 $self->check_size; 1803 $self->realloc;
1804
1805 1
1550} 1806}
1551 1807
1552sub focus_in { 1808sub focus_in {
1553 my ($self) = @_; 1809 my ($self) = @_;
1554 1810
… …
1569 utf8::encode $text; 1825 utf8::encode $text;
1570 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1571 1827
1572 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1573 $self->update; 1829 $self->update;
1830
1831 1
1574} 1832}
1575 1833
1576sub mouse_motion { 1834sub mouse_motion {
1577 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1578# 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
1579} 1839}
1580 1840
1581sub _draw { 1841sub _draw {
1582 my ($self) = @_; 1842 my ($self) = @_;
1583 1843
1584 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1585 1845
1586 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1587 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1588 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1589 } else { 1849 } else {
1590 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1591 } 1851 }
1592 1852
1593 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1595 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1596 glVertex 0 , 0; 1856 glVertex 0 , 0;
1597 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1598 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1599 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1634 if ($sym == 13) { 1894 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1899 $self->_emit (activate => $txt);
1640 $self->update; 1900 $self->update;
1641 1901
1642 } elsif ($sym == CFClient::SDLK_UP) { 1902 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1903 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1904 $self->{history_saveback} = $self->get_text;
… …
1660 } else { 1920 } else {
1661 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1662 } 1922 }
1663 1923
1664 } else { 1924 } else {
1665 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1666 } 1928 1
1667
1668} 1929}
1669 1930
1670############################################################################# 1931#############################################################################
1671 1932
1672package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1681 1942
1682sub new { 1943sub new {
1683 my $class = shift; 1944 my $class = shift;
1684 1945
1685 $class->SUPER::new ( 1946 $class->SUPER::new (
1686 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1687 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1689 can_hover => 1, 1951 can_hover => 1,
1690 align => 0, 1952 align => 0,
1691 valign => 0, 1953 valign => 0,
1692 can_events => 1, 1954 can_events => 1,
1693 @_ 1955 @_
1694 ) 1956 )
1695} 1957}
1696 1958
1959sub activate { }
1960
1697sub button_up { 1961sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1699 1963
1964 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1966 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate"); 1967
1703 } 1968 1
1704} 1969}
1705 1970
1706sub _draw { 1971sub _draw {
1707 my ($self) = @_; 1972 my ($self) = @_;
1708 1973
1709 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1710
1711 if ($GRAB == $self) {
1712 $self->{fg} = $self->{active_fg};
1713 }
1714 1975
1715 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1717 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1718 1979
… …
1723 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1724} 1985}
1725 1986
1726############################################################################# 1987#############################################################################
1727 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
1728package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1729 2028
1730our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1731 2030
1732my @tex = 2031my @tex =
… …
1737 2036
1738sub new { 2037sub new {
1739 my $class = shift; 2038 my $class = shift;
1740 2039
1741 $class->SUPER::new ( 2040 $class->SUPER::new (
1742 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1743 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 2047 state => 0,
… …
1751} 2051}
1752 2052
1753sub size_request { 2053sub size_request {
1754 my ($self) = @_; 2054 my ($self) = @_;
1755 2055
1756 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1757} 2057}
1758 2058
1759sub button_down { 2059sub button_down {
1760 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1761 2061
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1766 } 2070 1
1767} 2071}
1768 2072
1769sub _draw { 2073sub _draw {
1770 my ($self) = @_; 2074 my ($self) = @_;
1771 2075
1772 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1773 2077
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 2079
1776 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;
1777 2083
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 2085
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 2087
… …
1936 2242
1937 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
1938 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
1939 2245
1940 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
1941 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;
1942 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
1943 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1944 2251
1945 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
1946 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2045 my $self = $class->SUPER::new ( 2352 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2357 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2053 vertical => 0, 2360 vertical => 0,
2054 can_hover => 1, 2361 can_hover => 1,
2055 inner_pad => 0.02, 2362 inner_pad => 0.02,
2056 @_ 2363 @_
2057 ); 2364 );
… …
2060 $self->update; 2367 $self->update;
2061 2368
2062 $self 2369 $self
2063} 2370}
2064 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
2065sub set_value { 2385sub set_value {
2066 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2067 2387
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2388 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2389
2070 $hi = $lo + 1 if $hi <= $lo; 2390 $hi = $lo + 1 if $hi <= $lo;
2071 2391
2392 $page = $hi - $lo if $page > $hi - $lo;
2393
2072 $value = $lo if $value < $lo; 2394 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2395 $value = $hi - $page if $value > $hi - $page;
2074 2396
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2397 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2398 if $unit;
2077 2399
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2401
2082 if ($value != $old_value) { 2402 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2403 $self->_emit (changed => $value);
2084 $self->update; 2404 $self->update;
2085 } 2405 }
2086} 2406}
2087 2407
2088sub size_request { 2408sub size_request {
2089 my ($self) = @_; 2409 my ($self) = @_;
2090 2410
2091 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2412}
2096 2413
2097sub button_down { 2414sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2099 2416
2100 $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
2101 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2102} 2422}
2103 2423
2104sub mouse_motion { 2424sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2106 2426
2107 if ($GRAB == $self) { 2427 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2429
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2431
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2433
2114 $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
2115 } 2439 1
2116} 2440}
2117 2441
2118sub update { 2442sub update {
2119 my ($self) = @_; 2443 my ($self) = @_;
2120 2444
2121 $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}) {
2122 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2123 2454
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2456 my $range = ($hi - $page - $lo) || 1e-100;
2125 2457
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2458 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2459
2128 $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;
2129 2462
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2463 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2464 $value = $value * $self->{scale} + $self->{offset};
2132 2465
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2467 $self->{knob_w} = $knob_w;
2140 }); 2468 }
2141
2142 $self->SUPER::update;
2143}
2144
2145sub _draw {
2146 my ($self) = @_;
2147 2469
2148 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2149 2471
2150 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2151 2473
… …
2171 glDisable GL_TEXTURE_2D; 2493 glDisable GL_TEXTURE_2D;
2172} 2494}
2173 2495
2174############################################################################# 2496#############################################################################
2175 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
2176package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2177 2540
2178our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2179 2542
2180use CFClient::OpenGL; 2543use CFClient::OpenGL;
2181 2544
… …
2183 my $class = shift; 2546 my $class = shift;
2184 2547
2185 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2186 fontsize => 1, 2549 fontsize => 1,
2187 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2188 #font => default_font 2552 #font => default_font
2189 @_, 2553 @_,
2190 2554
2191 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2192 par => [], 2556 par => [],
… …
2207 2571
2208 $self->{fontsize} = $fontsize; 2572 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2573 $self->reflow;
2210} 2574}
2211 2575
2212sub text_height {
2213 my ($self, $text) = @_;
2214
2215 my $layout = $self->{layout};
2216
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w});
2219 $layout->set_markup ($text);
2220
2221 ($layout->size)[1]
2222}
2223
2224sub reflow {
2225 my ($self) = @_;
2226
2227 $self->{need_reflow}++;
2228 $self->update;
2229}
2230
2231sub size_allocate { 2576sub size_allocate {
2232 my ($self, $w, $h) = @_; 2577 my ($self, $w, $h) = @_;
2233 2578
2234 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2235 2580
2236 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2237 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $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});
2239 2585
2240 $self->reflow; 2586 $self->reflow;
2241} 2587}
2242 2588
2589sub text_size {
2590 my ($self, $text, $indent) = @_;
2591
2592 my $layout = $self->{layout};
2593
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($text);
2598
2599 $layout->size
2600}
2601
2602sub reflow {
2603 my ($self) = @_;
2604
2605 $self->{need_reflow}++;
2606 $self->update;
2607}
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
2243sub add_paragraph { 2624sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2625 my ($self, $color, $text, $indent) = @_;
2245 2626
2246 #TODO: intelligently "reformat" paragraph 2627 for my $line (split /\n/, $text) {
2247 2628 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2629 $self->{height} += $h;
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2631 }
2251 2632
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $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]);
2255 $self->{children}[1]->update;
2256} 2634}
2257 2635
2258sub update { 2636sub update {
2259 my ($self) = @_; 2637 my ($self) = @_;
2260 2638
… …
2262 2640
2263 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2264 2642
2265 delete $self->{texture}; 2643 delete $self->{texture};
2266 2644
2267 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647
2268 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2649 my $height = 0;
2270 2650
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2272 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 }
2273 2667
2274 $self->{height} = $height; 2668 $self->{height} = $height;
2275 2669
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2671
2278 delete $self->{texture}; 2672 delete $self->{texture};
2279 } 2673 }
2280 2674
2281 $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 {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2284 2678
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2289 2680
2290 my $y0 = $top; 2681 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2682 my $y1 = $top + $H;
2292 2683
2293 my $y = 0; 2684 my $y = 0;
2294 2685
2295 my $layout = $self->{layout}; 2686 my $layout = $self->{layout};
2296 2687
2297 $layout->set_font ($self->{font}) if $self->{font}; 2688 $layout->set_font ($self->{font}) if $self->{font};
2298 2689
2690 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693
2299 for my $par (@{$self->{par}}) { 2694 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2695 my $h = $par->[1];
2301 2696
2302 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2698 $layout->set_foreground (@{ $par->[2] });
2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2304 $layout->set_markup ($par->[2]); 2701 $layout->set_markup ($par->[4]);
2305 2702
2306 my ($W, $H) = $layout->size; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2704
2705 glRasterPos $par->[3], $y - $y0;
2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2707 }
2309 2708
2310 $y += $h; 2709 $y += $h;
2311 } 2710 }
2312 2711
2313 glDisable GL_TEXTURE_2D; 2712 glDisable GL_BLEND;
2314 }; 2713 };
2315 }); 2714 });
2316} 2715}
2317 2716
2318sub _draw { 2717sub _draw {
2319 my ($self) = @_; 2718 my ($self) = @_;
2320 2719
2321 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2323 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2324 $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});
2325 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2326 2725
2327 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2328 2727
2329} 2728}
… …
2378 2777
2379sub new { 2778sub new {
2380 my $class = shift; 2779 my $class = shift;
2381 2780
2382 my $self = $class->SUPER::new ( 2781 my $self = $class->SUPER::new (
2383 state => 0, 2782 state => 0,
2384 connect_activate => \&toggle_flopper, 2783 on_activate => \&toggle_flopper,
2385 @_ 2784 @_
2386 ); 2785 );
2387 2786
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 2787 $self
2394} 2788}
2395 2789
2396sub toggle_flopper { 2790sub toggle_flopper {
2397 my ($self) = @_; 2791 my ($self) = @_;
2398 2792
2399 # TODO: use animation 2793 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 2794}
2411 2795
2412############################################################################# 2796#############################################################################
2413 2797
2414package CFClient::UI::Tooltip; 2798package CFClient::UI::Tooltip;
… …
2427} 2811}
2428 2812
2429sub set_tooltip_from { 2813sub set_tooltip_from {
2430 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2431 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
2432 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2433 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 2831 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2437 ellipsise => 0, 2833 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2449 2845
2450sub size_allocate { 2846sub size_allocate {
2451 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2452 2848
2453 $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 });
2454} 2868}
2455 2869
2456sub _draw { 2870sub _draw {
2457 my ($self) = @_; 2871 my ($self) = @_;
2458 2872
… …
2475 glVertex $w, $h; 2889 glVertex $w, $h;
2476 glVertex $w, 0; 2890 glVertex $w, 0;
2477 glEnd; 2891 glEnd;
2478 2892
2479 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2480 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2481} 2896}
2482 2897
2483############################################################################# 2898#############################################################################
2484 2899
… …
2490 2905
2491sub new { 2906sub new {
2492 my $class = shift; 2907 my $class = shift;
2493 2908
2494 my $self = $class->SUPER::new ( 2909 my $self = $class->SUPER::new (
2495 aspect => 1, 2910 aspect => 1,
2911 can_events => 0,
2496 @_, 2912 @_,
2497 ); 2913 );
2498 2914
2499 if ($self->{anim} && $self->{animspeed}) { 2915 if ($self->{anim} && $self->{animspeed}) {
2500 Scalar::Util::weaken (my $widget = $self); 2916 Scalar::Util::weaken (my $widget = $self);
… …
2515 2931
2516sub size_request { 2932sub size_request {
2517 (32, 8) 2933 (32, 8)
2518} 2934}
2519 2935
2936sub update {
2937 my ($self) = @_;
2938
2939 return unless $self->{visible};
2940
2941 $self->SUPER::update;
2942}
2943
2520sub _draw { 2944sub _draw {
2521 my ($self) = @_; 2945 my ($self) = @_;
2522 2946
2523 return unless $::CONN;#d# manage and cache textures differently 2947 return unless $::CONN;
2524 2948
2525 my $face; 2949 my $face;
2526 2950
2527 if ($self->{frame}) { 2951 if ($self->{frame}) {
2528 my $anim = $::CONN->{anim}[$self->{anim}]; 2952 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2534 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2535 2959
2536 if ($tex) { 2960 if ($tex) {
2537 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2539 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2541 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2542 } 2966 }
2543} 2967}
2544 2968
2545sub DESTROY { 2969sub destroy {
2546 my ($self) = @_; 2970 my ($self) = @_;
2547 2971
2548 $self->{timer}->cancel 2972 $self->{timer}->cancel
2549 if $self->{timer}; 2973 if $self->{timer};
2550 2974
2551 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2552} 2976}
2553 2977
2554############################################################################# 2978#############################################################################
2555 2979
2556package CFClient::UI::InventoryItem; 2980package CFClient::UI::Buttonbar;
2557 2981
2558our @ISA = CFClient::UI::HBox::; 2982our @ISA = CFClient::UI::HBox::;
2559 2983
2560sub _item_to_desc { 2984# TODO: should actualyl wrap buttons and other goodies.
2561 my ($item) = @_;
2562
2563 my $desc =
2564 $item->{nrof} < 2
2565 ? $item->{name}
2566 : "$item->{nrof} × $item->{name_pl}";
2567
2568 $item->{flags} & Crossfire::Protocol::F_OPEN
2569 and $desc .= " (open)";
2570 $item->{flags} & Crossfire::Protocol::F_APPLIED
2571 and $desc .= " (applied)";
2572 $item->{flags} & Crossfire::Protocol::F_UNPAID
2573 and $desc .= " (unpaid)";
2574 $item->{flags} & Crossfire::Protocol::F_MAGIC
2575 and $desc .= " (magic)";
2576 $item->{flags} & Crossfire::Protocol::F_CURSED
2577 and $desc .= " (cursed)";
2578 $item->{flags} & Crossfire::Protocol::F_DAMNED
2579 and $desc .= " (damned)";
2580 $item->{flags} & Crossfire::Protocol::F_LOCKED
2581 and $desc .= " *";
2582
2583 $desc
2584}
2585
2586sub new {
2587 my $class = shift;
2588
2589 my %args = @_;
2590
2591 my $item = delete $args{item};
2592
2593 my $desc = _item_to_desc ($item);
2594
2595 my $self = $class->SUPER::new (
2596 can_hover => 1,
2597 can_events => 1,
2598 tooltip => ((CFClient::UI::Label::escape $desc)
2599 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2600 connect_button_down => sub {
2601 my ($self, $ev, $x, $y) = @_;
2602
2603 # todo: maybe put examine on 1? but should just be a tooltip :(
2604 if ($ev->{button} == 1) {
2605 my $targ = $::CONN->{player}{tag};
2606
2607 if ($item->{container} == $::CONN->{player}{tag}) {
2608 $targ = $main::OPENCONT;
2609 }
2610
2611 $::CONN->send ("move $targ $item->{tag} 0");
2612 } elsif ($ev->{button} == 2) {
2613 $::CONN->send ("apply $item->{tag}");
2614 } elsif ($ev->{button} == 3) {
2615 my @menu_items = (
2616 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2617 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2618 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2619 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2620 [
2621 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2622 sub { $::CONN->send ("lock $item->{tag}") },
2623 ],
2624 );
2625
2626 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2627 }
2628
2629 1
2630 },
2631 %args
2632 );
2633
2634
2635 $self->add (new CFClient::UI::Face
2636 can_events => 0,
2637 face => $item->{face},
2638 anim => $item->{anim},
2639 animspeed => $item->{animspeed},
2640 );
2641
2642 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2643
2644 $self->{item} = $item;
2645
2646 $self->update_item;
2647
2648 $self
2649}
2650
2651sub update_item {
2652 my ($self) = @_;
2653
2654 my $desc = _item_to_desc ($self->{item});
2655
2656 $self->{name_lbl}->set_text ($desc);
2657}
2658
2659#############################################################################
2660
2661package CFClient::UI::Inventory;
2662
2663our @ISA = CFClient::UI::ScrolledWindow::;
2664
2665sub new {
2666 my $class = shift;
2667
2668 my $self = $class->SUPER::new (
2669 scrolled => (new CFClient::UI::VBox),
2670 @_,
2671 );
2672
2673 $self
2674}
2675
2676sub set_items {
2677 my ($self, $items) = @_;
2678
2679 $self->{scrolled}->clear;
2680 return unless $items;
2681
2682 my @items = sort {
2683 ($a->{type} <=> $b->{type})
2684 or ($a->{name} cmp $b->{name})
2685 } @$items;
2686
2687 $self->{real_items} = \@items;
2688
2689 for my $item (@items) {
2690 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2691 $item->update_item ();
2692 }
2693
2694 $self->{scrolled}->add (@items);
2695
2696# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2697}
2698
2699sub size_request {
2700 my ($self) = @_;
2701 ($self->{req_w}, $self->{req_h});
2702}
2703 2985
2704############################################################################# 2986#############################################################################
2705 2987
2706package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2707 2989
… …
2719 ); 3001 );
2720 3002
2721 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2722 3004
2723 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2724 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2725 3007
2726 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2727 if (!ref $widget) { 3009 if (!ref $widget) {
2728 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2729 can_hover => 1, 3011 can_hover => 1,
2730 can_events => 1, 3012 can_events => 1,
2731 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2732 } 3015 }
2733 3016
2734 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2735 3018
2736 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2741 3024
2742# 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)
2743sub popup { 3026sub popup {
2744 my ($self, $ev) = @_; 3027 my ($self, $ev) = @_;
2745 3028
2746 $self->emit ("popdown"); 3029 $self->_emit ("popdown");
2747 3030
2748 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2749 $GRAB = $self; 3032 $GRAB = $self;
2750 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2751 3034
2752 $self->show; 3035 $self->show;
2753 $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);
2754} 3037}
2755 3038
2756sub mouse_motion { 3039sub mouse_motion {
2757 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2758 3041
2759 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2760 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2761 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2762} 3047}
2763 3048
2764sub button_up { 3049sub button_up {
2765 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2766 3051
2767 if ($ev->{button} == $self->{button}) { 3052 if ($ev->{button} == $self->{button}) {
2768 undef $GRAB; 3053 undef $GRAB;
2769 $self->hide; 3054 $self->hide;
2770 3055
2771 $self->emit ("popdown"); 3056 $self->_emit ("popdown");
2772 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2773 } 3062 1
2774} 3063}
2775 3064
2776############################################################################# 3065#############################################################################
2777 3066
2778package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2779 3068
2780our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2781 3070
2782sub new { 3071sub new {
2783 my $class = shift; 3072 my $class = shift;
2784 3073
2785 $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 (
2786 fontsize => 0.8, 3239 fontsize => 0.8,
2787 @_, 3240 @_,
2788 ) 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
2789} 3248}
2790 3249
2791sub reorder { 3250sub reorder {
2792 my ($self) = @_; 3251 my ($self) = @_;
2793 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} };
2794 3258
2795 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2796 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2797 } 3261 }
2798 3262
… …
2801 my @items = sort { 3265 my @items = sort {
2802 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2803 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2804 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2805 3269
3270 $self->{timer}->interval (1);
3271
2806 my $count = 10 + 1; 3272 my $count = 10 + 1;
2807 for my $item (@items) { 3273 for my $item (@items) {
2808 last unless --$count; 3274 last unless --$count;
2809 3275
2810 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2811 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2812 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2813 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2814 : $item->{text}; 3280 : $item->{text};
2815 3281
… …
2823 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2824 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2825 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2826 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2827 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2828 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2829 can_events => 1, 3295 can_events => 1,
2830 can_hover => 1 3296 can_hover => 1
2831 }; 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;
2832 } 3310 }
2833 3311
2834 $self->clear; 3312 $self->clear;
2835 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2836} 3314}
… …
2839 my ($self, $text, %arg) = @_; 3317 my ($self, $text, %arg) = @_;
2840 3318
2841 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2842 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2843 3321
3322 return unless $text;
3323
2844 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2845 3325
2846 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2847 3327
2848 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2849 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2850 $item->{count}++; 3330 $item->{count}++;
2851 } else { 3331 } else {
2852 $item->{count} = 1; 3332 $item->{count} = 1;
2853 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2854 } 3334 }
2855 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2856 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2857 delete $item->{label}; 3337 delete $item->{label};
2858 } else { 3338 } else {
2859 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2860 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
2879 3359
2880 $self->reorder; 3360 $self->reorder;
2881 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2882} 3362}
2883 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2884############################################################################# 3372#############################################################################
2885 3373
2886package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
2887 3375
2888our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
2889
2890use CFClient::OpenGL;
2891 3377
2892sub new { 3378sub new {
2893 my $class = shift; 3379 my $class = shift;
2894 3380
2895 $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 => [],
2896 @_, 3624 @_,
2897 ) 3625 )
2898} 3626}
2899 3627
2900sub configure { 3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2901 my ($self, $x, $y, $w, $h) = @_;
2902 3629
2903 $self->{w} = $w; 3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2904 $self->{h} = $h; 3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2905} 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");
2906 3640
2907sub 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 {
2908 my ($self) = @_; 3714 my ($self, $spell) = @_;
2909 3715
2910 $self->size_allocate ($self->{w}, $self->{h}) 3716 $self->{spell}->{$spell->{name}} = $spell;
2911 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
2912} 3755}
2913 3756
2914sub size_request { 3757sub size_request {
2915 my ($self) = @_; 3758 my ($self) = @_;
2916 3759
2917 ($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
2918} 3775}
2919 3776
2920sub size_allocate { 3777sub size_allocate {
2921 my ($self, $w, $h) = @_; 3778 my ($self, $w, $h) = @_;
2922 3779
2923 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2924 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2925
2926 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2927 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2928
2929 for my $child ($self->children) { 3780 for my $child ($self->children) {
2930 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)};
2931 3782
2932 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3783 $X = $child->{force_x} if exists $child->{force_x};
2933 if exists $child->{req_x}; 3784 $Y = $child->{force_y} if exists $child->{force_y};
2934 3785
2935 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3786 $X = _to_pixel $X, $W, $self->{w};
2936 if exists $child->{req_y}; 3787 $Y = _to_pixel $Y, $H, $self->{h};
2937
2938 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2939 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2940 3788
2941 $child->configure ($X, $Y, $W, $H); 3789 $child->configure ($X, $Y, $W, $H);
2942 } 3790 }
2943} 3791}
2944 3792
… …
2955} 3803}
2956 3804
2957sub update { 3805sub update {
2958 my ($self) = @_; 3806 my ($self) = @_;
2959 3807
2960 $self->check_size;
2961 $::WANT_REFRESH++; 3808 $::WANT_REFRESH++;
2962} 3809}
2963 3810
2964sub add { 3811sub add {
2965 my ($self, @children) = @_; 3812 my ($self, @children) = @_;
2966 3813
2967 for my $child (@children) {
2968 $child->{toplevel} = 1; 3814 $_->{is_toplevel} = 1
2969 3815 for @children;
2970 # integerise window positions
2971 $child->{x} = int $child->{x};
2972 $child->{y} = int $child->{y};
2973 }
2974 3816
2975 $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;
3827
3828 while (@children) {
3829 my $w = pop @children;
3830 push @children, $w->children;
3831 $w->set_invisible;
3832 }
2976} 3833}
2977 3834
2978sub on_refresh { 3835sub on_refresh {
2979 my ($self, $id, $cb) = @_; 3836 my ($self, $id, $cb) = @_;
2980 3837
… …
2993 while ($self->{refresh_hook}) { 3850 while ($self->{refresh_hook}) {
2994 $_->() 3851 $_->()
2995 for values %{delete $self->{refresh_hook}}; 3852 for values %{delete $self->{refresh_hook}};
2996 } 3853 }
2997 3854
2998 if ($self->{check_size}) { 3855 if ($self->{realloc}) {
2999 my @queue = ([], []); 3856 my %queue;
3857 my @queue;
3858 my $widget;
3000 3859
3001 for (;;) { 3860 outer:
3002 if ($self->{check_size}) { 3861 while () {
3003 # heuristic: check containers last 3862 if (my $realloc = delete $self->{realloc}) {
3004 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3863 for $widget (values %$realloc) {
3005 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 }
3006 } 3870 }
3007 3871
3008 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3872 while () {
3873 @queue or last outer;
3009 3874
3010 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3875 $widget = pop @{ $queue[-1] || [] }
3011 ? @$widget{qw(user_w user_h)} 3876 and last;
3012 : $widget->size_request;
3013
3014 if (delete $widget->{force_alloc}
3015 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3016 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3017 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}) {
3018 $widget->{req_w} = $w; 3896 $widget->{req_w} = $w;
3019 $widget->{req_h} = $h; 3897 $widget->{req_h} = $h;
3020 3898
3021 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3899 $self->{size_alloc}{$widget+0} = $widget;
3022 3900
3023 $widget->{parent}->check_size
3024 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 }
3025 } 3908 }
3909
3910 delete $self->{realloc}{$widget+0};
3026 } 3911 }
3027 } 3912 }
3028 3913
3029 while ($self->{size_alloc}) { 3914 while (my $size_alloc = delete $self->{size_alloc}) {
3030 for (values %{delete $self->{size_alloc}}) { 3915 my @queue = sort { $b->{visible} <=> $a->{visible} }
3031 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)};
3032 3922
3033 $w = 0 if $w < 0; 3923 $w = 0 if $w < 0;
3034 $h = 0 if $h < 0; 3924 $h = 0 if $h < 0;
3035 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
3036 $widget->{w} = $w; 3933 $widget->{w} = $w;
3037 $widget->{h} = $h; 3934 $widget->{h} = $h;
3038 $widget->size_allocate ($w, $h); 3935
3039 $widget->emit (size_allocate => $w, $h); 3936 $widget->emit (size_allocate => $w, $h);
3937 }
3040 } 3938 }
3041 } 3939 }
3042 3940
3043 while ($self->{post_alloc_hook}) { 3941 while ($self->{post_alloc_hook}) {
3044 $_->() 3942 $_->()
3045 for values %{delete $self->{post_alloc_hook}}; 3943 for values %{delete $self->{post_alloc_hook}};
3046 } 3944 }
3047 3945
3946
3048 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3049 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3050 glClear GL_COLOR_BUFFER_BIT; 3949 glClear GL_COLOR_BUFFER_BIT;
3051 3950
3052 glMatrixMode GL_PROJECTION; 3951 glMatrixMode GL_PROJECTION;
3053 glLoadIdentity; 3952 glLoadIdentity;
3054 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3055 glMatrixMode GL_MODELVIEW; 3954 glMatrixMode GL_MODELVIEW;
3056 glLoadIdentity; 3955 glLoadIdentity;
3057 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
3058 $self->_draw; 3964 $self->_draw;
3059} 3965}
3060 3966
3061############################################################################# 3967#############################################################################
3062 3968

Diff Legend

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