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.214 by root, Wed May 17 22:59:13 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# glColorMask 1, 1, 1, 0;
697# glEnable GL_BLEND;
698# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699# glRasterPos 0, 0;
700# glCopyPixels 0, 0, $self->{w}, $self->{h};
701# glDisable GL_BLEND;
702# glColorMask 1, 1, 1, 1;
703 }; 851 };
704} 852}
705 853
706sub _draw { 854sub _draw {
707 my ($self) = @_; 855 my ($self) = @_;
708 856
709 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
710 858
711 my $tex = $self->{texture} 859 my $tex = $self->{texture}
712 or return; 860 or return;
713 861
714 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
… …
724 872
725package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
726 874
727our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
728 876
877sub new {
878 my $class = shift;
879
880 $class->SUPER::new (
881 scroll_x => 0,
882 scroll_y => 1,
883 @_,
884 )
885}
886
729sub size_request { 887sub size_request {
730 my ($self) = @_; 888 my ($self) = @_;
731 889
732 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
734 891
735 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
736} 896}
737 897
738sub size_allocate { 898sub size_allocate {
739 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
740 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);
741 $self->update; 907 $self->update;
742} 908}
743 909
744sub set_offset { 910sub set_offset {
745 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
… …
779} 945}
780 946
781sub _render { 947sub _render {
782 my ($self) = @_; 948 my ($self) = @_;
783 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
784 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
785 954
786 $self->SUPER::_render; 955 $self->SUPER::_render;
787} 956}
788 957
… …
791package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
792 961
793our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
794 963
795sub new { 964sub new {
796 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
797 968
798 my $self; 969 my $self;
799 970
800 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
801 vertical => 1, 972 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub { 974 on_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 975 $self->{vp}->set_offset (0, $_[1]);
805 }, 976 },
806 ; 977 ;
807 978
808 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
809 vp => (new CFClient::UI::ViewPort), 980 vp => (new CFClient::UI::ViewPort expand => 1),
810 slider => $slider, 981 slider => $slider,
811 @_, 982 %arg,
812 ); 983 );
813 984
814 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp});
816 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
817 987
818 $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]);
819} 1014}
820 1015
821#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
822# update viewport offset on scroll 1017# update viewport offset on scroll
823 1018
… …
843 1038
844 if ($self->{bg}) { 1039 if ($self->{bg}) {
845 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
846 1041
847 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
849 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
850 1045
851 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
852 glVertex 0 , 0; 1047 glVertex 0 , 0;
853 glVertex 0 , $h; 1048 glVertex 0 , $h;
854 glVertex $w, $h; 1049 glVertex $w, $h;
… …
867 1062
868our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
869 1064
870use CFClient::OpenGL; 1065use CFClient::OpenGL;
871 1066
872my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
874 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);
875 1074
876sub new { 1075sub new {
877 my $class = shift; 1076 my ($class, %arg) = @_;
878
879 # TODO: user_x, user_y, overwrite moveto?
880 1077
881 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
882 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
883 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
884 border => 0.6, 1081 border => 0.6,
885 toplevel => 1,
886 can_events => 1, 1082 can_events => 1,
887 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
888 ); 1086 );
889 1087
890 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
891 align => 0, 1089 align => 0,
892 valign => 1, 1090 valign => 1,
893 text => $self->{title}, 1091 text => $self->{title},
894 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 }
895 1103
896 $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};
897} 1113}
898 1114
899sub border { 1115sub border {
900 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
901} 1117}
902 1118
903sub size_request { 1119sub size_request {
904 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};
905 1127
906 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
907 1129
908 ( 1130 (
909 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
912} 1134}
913 1135
914sub size_allocate { 1136sub size_allocate {
915 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
916 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
917 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
918 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
919 1149
920 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
921 if $self->{title};
922
923 $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};
924} 1154}
925 1155
926sub button_down { 1156sub button_down {
927 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
928 1158
… …
944 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
945 1175
946 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
947 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
948 1178
949 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
950 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
951 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
952 $self->check_size; 1183 $self->realloc;
953 }; 1184 };
954 1185
955 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
956 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
957 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
959 $self->{motion} = sub { 1190 $self->{motion} = sub {
960 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
961 1192
962 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
963 1194
964 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
965 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
966 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
967 } 1203 1
968} 1204}
969 1205
970sub button_up { 1206sub button_up {
971 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
972 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
973 delete $self->{motion}; 1212 !!delete $self->{motion}
974} 1213}
975 1214
976sub mouse_motion { 1215sub mouse_motion {
977 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
978 1217
979 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
980} 1221}
981 1222
982sub _draw { 1223sub _draw {
983 my ($self) = @_; 1224 my ($self) = @_;
984 1225
1226 my $child = $self->{children}[0];
1227
985 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
986 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
987 1230
988 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
990 1233
991 my $border = $self->border; 1234 my $border = $self->border;
992 1235
993 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
994 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
998 1241
999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1000 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
1001 1244
1002 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
1003 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
1004 my $rep_y = $ch / $bg->{h}; 1248 $bg->{t} = $ch / $bg->{h};
1005
1006 glColor @{ $self->{bg} };
1007
1008 $bg->{s} = $rep_x;
1009 $bg->{t} = $rep_y;
1010 $bg->{wrap_mode} = 1;
1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 } 1250 }
1013 1251
1014 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1015 1253
1016 $self->{title}->draw if $self->{title};
1017
1018 $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};
1019} 1265}
1020 1266
1021############################################################################# 1267#############################################################################
1022 1268
1023package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1031sub new { 1277sub new {
1032 my $class = shift; 1278 my $class = shift;
1033 1279
1034 $class->SUPER::new ( 1280 $class->SUPER::new (
1035 col_expand => [], 1281 col_expand => [],
1036 @_ 1282 @_,
1037 ) 1283 )
1284}
1285
1286sub children {
1287 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1038} 1288}
1039 1289
1040sub add { 1290sub add {
1041 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1042 1292
1043 $child->set_parent ($self); 1293 $child->set_parent ($self);
1044 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1045 1295
1046 $child->check_size; 1296 $self->realloc;
1047} 1297}
1048 1298
1049sub children { 1299sub remove {
1050 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1300 my ($self, $child) = @_;
1051}
1052 1301
1302 # TODO: not yet implemented
1303}
1304
1053# 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?
1054sub clear { 1306sub clear {
1055 my ($self) = @_; 1307 my ($self) = @_;
1056 1308
1057 my @children = $self->children; 1309 my @children = $self->children;
1058 delete $self->{children}; 1310 delete $self->{children};
… …
1060 for (@children) { 1312 for (@children) {
1061 delete $_->{parent}; 1313 delete $_->{parent};
1062 $_->hide; 1314 $_->hide;
1063 } 1315 }
1064 1316
1065 $self->update; 1317 $self->realloc;
1066} 1318}
1067 1319
1068sub get_wh { 1320sub get_wh {
1069 my ($self) = @_; 1321 my ($self) = @_;
1070 1322
… …
1101sub size_allocate { 1353sub size_allocate {
1102 my ($self, $w, $h) = @_; 1354 my ($self, $w, $h) = @_;
1103 1355
1104 my ($ws, $hs) = $self->get_wh; 1356 my ($ws, $hs) = $self->get_wh;
1105 1357
1106 my $req_w = sum @$ws; 1358 my $req_w = (sum @$ws) || 1;
1107 my $req_h = sum @$hs; 1359 my $req_h = (sum @$hs) || 1;
1108 1360
1109 # TODO: nicer code && do row_expand 1361 # TODO: nicer code && do row_expand
1110 my @col_expand = @{$self->{col_expand}}; 1362 my @col_expand = @{$self->{col_expand}};
1111 @col_expand = (1) x @$ws unless @col_expand; 1363 @col_expand = (1) x @$ws unless @col_expand;
1112 my $col_expand = (sum @col_expand) || 1; 1364 my $col_expand = (sum @col_expand) || 1;
… …
1166 } 1418 }
1167} 1419}
1168 1420
1169############################################################################# 1421#############################################################################
1170 1422
1171package CFClient::UI::HBox; 1423package CFClient::UI::Box;
1172
1173# TODO: wrap into common Box base class
1174 1424
1175our @ISA = CFClient::UI::Container::; 1425our @ISA = CFClient::UI::Container::;
1176 1426
1177sub size_request { 1427sub size_request {
1178 my ($self) = @_; 1428 my ($self) = @_;
1179 1429
1180 my @alloc = map [$_->size_request], @{$self->{children}}; 1430 $self->{vertical}
1181 1431 ? (
1182 ( 1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1183 (List::Util::sum map $_->[0], @alloc), 1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1184 (List::Util::max map $_->[1], @alloc), 1434 )
1185 ) 1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1186} 1439}
1187 1440
1188sub size_allocate { 1441sub size_allocate {
1189 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1190 1443
1191 ($h, $w) = ($w, $h); 1444 my $space = $self->{vertical} ? $h : $w;
1192
1193 my $children = $self->{children}; 1445 my $children = $self->{children};
1194 1446
1195 my @h = map $_->{req_w}, @$children; 1447 my @req;
1196 1448
1197 my $req_h = List::Util::sum @h; 1449 if ($self->{homogeneous}) {
1198 1450 @req = ($space / (@$children || 1)) x @$children;
1199 if ($req_h > $h) {
1200 # ah well, not enough space
1201 $_ *= $h / $req_h for @h;
1202 } 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 {
1203 my $exp = List::Util::sum map $_->{expand}, @$children; 1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1204 $exp ||= 1;
1205 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children->[$_]{expand}
1206 for (0 .. $#$children) { 1464 for 0 .. $#$children;
1207 my $child = $children->[$_];
1208
1209 my $alloc_h = $h[$_];
1210 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1211 $h[$_] = $alloc_h;
1212 } 1465 }
1213 } 1466 }
1214 1467
1215 CFClient::UI::harmonize \@h; 1468 CFClient::UI::harmonize \@req;
1216 1469
1217 my $y = 0; 1470 my $pos = 0;
1218 for (0 .. $#$children) { 1471 for (0 .. $#$children) {
1219 my $child = $children->[$_];
1220 my $h = $h[$_]; 1472 my $alloc = $req[$_];
1221 $child->configure ($y, 0, $h, $w); 1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1222 1474
1223 $y += $h; 1475 $pos += $alloc;
1224 } 1476 }
1225 1477
1226 1 1478 1
1227} 1479}
1228 1480
1229############################################################################# 1481#############################################################################
1230 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
1231package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1232 1499
1233# TODO: wrap into common Box base class
1234
1235our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1236 1501
1237sub size_request { 1502sub new {
1238 my ($self) = @_; 1503 my $class = shift;
1239 1504
1240 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1241 1506 vertical => 1,
1242 ( 1507 @_,
1243 (List::Util::max map $_->[0], @alloc),
1244 (List::Util::sum map $_->[1], @alloc),
1245 ) 1508 )
1246}
1247
1248sub size_allocate {
1249 my ($self, $w, $h) = @_;
1250
1251 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1253 my $children = $self->{children};
1254
1255 my @h = map $_->{req_h}, @$children;
1256
1257 my $req_h = List::Util::sum @h;
1258
1259 if ($req_h > $h) {
1260 # ah well, not enough space
1261 $_ *= $h / $req_h for @h;
1262 } else {
1263 my $exp = List::Util::sum map $_->{expand}, @$children;
1264 $exp ||= 1;
1265
1266 for (0 .. $#$children) {
1267 my $child = $children->[$_];
1268
1269 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1270 }
1271 }
1272
1273 CFClient::UI::harmonize \@h;
1274
1275 my $y = 0;
1276 for (0 .. $#$children) {
1277 my $child = $children->[$_];
1278 my $h = $h[$_];
1279 $child->configure (0, $y, $w, $h);
1280
1281 $y += $h;
1282 }
1283
1284 1
1285} 1509}
1286 1510
1287############################################################################# 1511#############################################################################
1288 1512
1289package CFClient::UI::Label; 1513package CFClient::UI::Label;
… …
1306 ellipsise => 3, # end 1530 ellipsise => 3, # end
1307 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1308 fontsize => 1, 1532 fontsize => 1,
1309 align => -1, 1533 align => -1,
1310 valign => -1, 1534 valign => -1,
1311 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1312 can_events => 0, 1537 can_events => 0,
1313 %arg 1538 %arg
1314 ); 1539 );
1315 1540
1316 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1343 1568
1344 delete $self->{texture}; 1569 delete $self->{texture};
1345 $self->SUPER::update; 1570 $self->SUPER::update;
1346} 1571}
1347 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1348sub set_text { 1580sub set_text {
1349 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1350 1582
1351 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1352 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1353 1585
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1355 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1356 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1357 $self->update; 1591 $self->update;
1358 $self->check_size;
1359} 1592}
1360 1593
1361sub set_markup { 1594sub set_markup {
1362 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1363 1596
… …
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368 1601
1369 $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;
1370 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1371 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1372 $self->update; 1607 $self->update;
1373 $self->check_size;
1374} 1608}
1375 1609
1376sub size_request { 1610sub size_request {
1377 my ($self) = @_; 1611 my ($self) = @_;
1378 1612
1613 $self->{size_req} ||= do {
1379 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1380 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1381 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1382 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1384 1619
1385 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1386 1621
1387 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1388 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1389 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1390 1625
1391 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1392 1627
1393 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1394 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1395 } 1633 };
1396 1634
1397 ( 1635 @{ $self->{size_req} }
1398 $w + $self->{padding} * 2,
1399 $h + $self->{padding} * 2,
1400 )
1401} 1636}
1402 1637
1403sub size_allocate { 1638sub size_allocate {
1404 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1405 1640
1641 delete $self->{ox};
1642
1406 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1407} 1645}
1408 1646
1409sub set_fontsize { 1647sub set_fontsize {
1410 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1411 1649
1412 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1413 delete $self->{texture}; 1651 delete $self->{texture};
1414 1652
1415 $self->update; 1653 $self->realloc;
1416 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1417} 1662}
1418 1663
1419sub _draw { 1664sub _draw {
1420 my ($self) = @_; 1665 my ($self) = @_;
1421 1666
… …
1427 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1428 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431 1676
1432 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1433 1679
1680 unless (exists $self->{ox}) {
1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1436 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1437 1684
1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1440 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1441
1442 $tex
1443 }; 1688 };
1444 1689
1445 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1446 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};
1447 1694
1448 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1449 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1450 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1451 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1452 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1453 } 1702 }
1454 1703
1455 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1456} 1705}
1457 1706
… …
1473 active_fg => [0, 0, 0], 1722 active_fg => [0, 0, 0],
1474 can_hover => 1, 1723 can_hover => 1,
1475 can_focus => 1, 1724 can_focus => 1,
1476 valign => 0, 1725 valign => 0,
1477 can_events => 1, 1726 can_events => 1,
1727 #text => ...
1728 #hidden => "*",
1478 @_ 1729 @_
1479 ) 1730 )
1480} 1731}
1481 1732
1482sub _set_text { 1733sub _set_text {
… …
1484 1735
1485 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1486 1737
1487 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1488 1739
1489 delete $self->{texture};
1490
1491 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1492 $self->{text} = $text; 1741 $self->{text} = $text;
1493 1742
1494 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1495 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1496 1746
1497 $self->emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1498} 1751}
1499 1752
1500sub set_text { 1753sub set_text {
1501 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1502 1755
1503 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1504 $self->_set_text ($text); 1757 $self->_set_text ($text);
1505 $self->update;
1506 $self->check_size;
1507} 1758}
1508 1759
1509sub get_text { 1760sub get_text {
1510 $_[0]{text} 1761 $_[0]{text}
1511} 1762}
… …
1514 my ($self) = @_; 1765 my ($self) = @_;
1515 1766
1516 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1517 1768
1518 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1519}
1520
1521sub size_allocate {
1522 my ($self, $w, $h) = @_;
1523
1524 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1525} 1770}
1526 1771
1527sub key_down { 1772sub key_down {
1528 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1529 1774
… …
1544 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1545 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1546 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1547 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1548 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1549 $self->emit ('escape'); 1794 $self->_emit ('escape');
1550 } elsif ($uni) { 1795 } elsif ($uni) {
1551 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1552 } 1799 }
1553 1800
1554 $self->_set_text ($text); 1801 $self->_set_text ($text);
1555 $self->update; 1802
1556 $self->check_size; 1803 $self->realloc;
1804
1805 1
1557} 1806}
1558 1807
1559sub focus_in { 1808sub focus_in {
1560 my ($self) = @_; 1809 my ($self) = @_;
1561 1810
… …
1576 utf8::encode $text; 1825 utf8::encode $text;
1577 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1578 1827
1579 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1580 $self->update; 1829 $self->update;
1830
1831 1
1581} 1832}
1582 1833
1583sub mouse_motion { 1834sub mouse_motion {
1584 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1585# 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
1586} 1839}
1587 1840
1588sub _draw { 1841sub _draw {
1589 my ($self) = @_; 1842 my ($self) = @_;
1590 1843
1591 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1592 1845
1593 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1594 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1595 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1596 } else { 1849 } else {
1597 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1598 } 1851 }
1599 1852
1600 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1601 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1602 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1603 glVertex 0 , 0; 1856 glVertex 0 , 0;
1604 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1605 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1606 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1641 if ($sym == 13) { 1894 if ($sym == 13) {
1642 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1643 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1644 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1645 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1646 $self->emit (activate => $txt); 1899 $self->_emit (activate => $txt);
1647 $self->update; 1900 $self->update;
1648 1901
1649 } elsif ($sym == CFClient::SDLK_UP) { 1902 } elsif ($sym == CFClient::SDLK_UP) {
1650 if ($self->{history_pointer} < 0) { 1903 if ($self->{history_pointer} < 0) {
1651 $self->{history_saveback} = $self->get_text; 1904 $self->{history_saveback} = $self->get_text;
… …
1667 } else { 1920 } else {
1668 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1669 } 1922 }
1670 1923
1671 } else { 1924 } else {
1672 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1673 } 1928 1
1674
1675} 1929}
1676 1930
1677############################################################################# 1931#############################################################################
1678 1932
1679package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1688 1942
1689sub new { 1943sub new {
1690 my $class = shift; 1944 my $class = shift;
1691 1945
1692 $class->SUPER::new ( 1946 $class->SUPER::new (
1693 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1694 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1695 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1696 can_hover => 1, 1951 can_hover => 1,
1697 align => 0, 1952 align => 0,
1698 valign => 0, 1953 valign => 0,
1699 can_events => 1, 1954 can_events => 1,
1700 @_ 1955 @_
1701 ) 1956 )
1702} 1957}
1703 1958
1959sub activate { }
1960
1704sub button_up { 1961sub button_up {
1705 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1706 1963
1964 $self->emit ("activate")
1707 if ($x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1708 && $y >= 0 && $y < $self->{h}) { 1966 && $y >= 0 && $y < $self->{h};
1709 $self->emit ("activate"); 1967
1710 } 1968 1
1711} 1969}
1712 1970
1713sub _draw { 1971sub _draw {
1714 my ($self) = @_; 1972 my ($self) = @_;
1715 1973
1716 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1717
1718 if ($GRAB == $self) {
1719 $self->{fg} = $self->{active_fg};
1720 }
1721 1975
1722 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1724 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1725 1979
… …
1730 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1731} 1985}
1732 1986
1733############################################################################# 1987#############################################################################
1734 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
1735package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1736 2028
1737our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1738 2030
1739my @tex = 2031my @tex =
… …
1744 2036
1745sub new { 2037sub new {
1746 my $class = shift; 2038 my $class = shift;
1747 2039
1748 $class->SUPER::new ( 2040 $class->SUPER::new (
1749 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1750 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1751 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1754 state => 0, 2047 state => 0,
… …
1758} 2051}
1759 2052
1760sub size_request { 2053sub size_request {
1761 my ($self) = @_; 2054 my ($self) = @_;
1762 2055
1763 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1764} 2057}
1765 2058
1766sub button_down { 2059sub button_down {
1767 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1768 2061
1769 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1770 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1771 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1772 $self->emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1773 } 2070 1
1774} 2071}
1775 2072
1776sub _draw { 2073sub _draw {
1777 my ($self) = @_; 2074 my ($self) = @_;
1778 2075
1779 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1780 2077
1781 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1782 2079
1783 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;
1784 2083
1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1786 2085
1787 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788 2087
… …
1943 2242
1944 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
1945 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
1946 2245
1947 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
1948 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;
1949 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
1950 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1951 2251
1952 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
1953 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2052 my $self = $class->SUPER::new ( 2352 my $self = $class->SUPER::new (
2053 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2054 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2057 range => [0, 0, 100, 10], 2357 range => [0, 0, 100, 10, 0],
2058 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2059 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2060 vertical => 0, 2360 vertical => 0,
2061 can_hover => 1, 2361 can_hover => 1,
2062 inner_pad => .05, 2362 inner_pad => 0.02,
2063 @_ 2363 @_
2064 ); 2364 );
2065 2365
2066 $self->set_value ($self->{range}[0]); 2366 $self->set_value ($self->{range}[0]);
2067 $self->update; 2367 $self->update;
2068 2368
2069 $self 2369 $self
2070} 2370}
2071 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
2072sub set_value { 2385sub set_value {
2073 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2074 2387
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2388 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076 2389
2077 $hi = $lo + 1 if $hi <= $lo; 2390 $hi = $lo + 1 if $hi <= $lo;
2078 2391
2392 $page = $hi - $lo if $page > $hi - $lo;
2393
2079 $value = $lo if $value < $lo; 2394 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi; 2395 $value = $hi - $page if $value > $hi - $page;
2081 2396
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2397 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit; 2398 if $unit;
2084 2399
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088 2401
2089 if ($value != $old_value) { 2402 if ($value != $old_value) {
2090 $self->emit (changed => $value); 2403 $self->_emit (changed => $value);
2091 $self->update; 2404 $self->update;
2092 } 2405 }
2093} 2406}
2094 2407
2095sub size_request { 2408sub size_request {
2096 my ($self) = @_; 2409 my ($self) = @_;
2097 2410
2098 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2099 my $h = $self->{req_h};
2100
2101 $self->{vertical} ? ($h, $w) : ($w, $h)
2102} 2412}
2103 2413
2104sub button_down { 2414sub button_down {
2105 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2106 2416
2107 $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
2108 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2109} 2422}
2110 2423
2111sub mouse_motion { 2424sub mouse_motion {
2112 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2113 2426
2114 if ($GRAB == $self) { 2427 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116 2429
2117 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118 2431
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120 2433
2121 $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
2122 } 2439 1
2123} 2440}
2124 2441
2125sub update { 2442sub update {
2126 my ($self) = @_; 2443 my ($self) = @_;
2127 2444
2128 $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}) {
2129 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2130 2454
2131 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2456 my $range = ($hi - $page - $lo) || 1e-100;
2132 2457
2133 my $inner_w = 1 - 2 * $self->{inner_pad}; 2458 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134 2459
2135 $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;
2136 2462
2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2463 $value = ($value - $lo) / $range;
2138 $value = $self->{scale} * ($value - $lo); 2464 $value = $value * $self->{scale} + $self->{offset};
2139 2465
2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2146 $self->{knob_w} = $page; 2467 $self->{knob_w} = $knob_w;
2147 }); 2468 }
2148
2149 $self->SUPER::update;
2150}
2151
2152sub _draw {
2153 my ($self) = @_;
2154 2469
2155 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2156 2471
2157 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2158 2473
… …
2178 glDisable GL_TEXTURE_2D; 2493 glDisable GL_TEXTURE_2D;
2179} 2494}
2180 2495
2181############################################################################# 2496#############################################################################
2182 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
2183package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2184 2540
2185our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2186 2542
2187use CFClient::OpenGL; 2543use CFClient::OpenGL;
2188 2544
… …
2190 my $class = shift; 2546 my $class = shift;
2191 2547
2192 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2193 fontsize => 1, 2549 fontsize => 1,
2194 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2195 #font => default_font 2552 #font => default_font
2196 @_, 2553 @_,
2197 2554
2198 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2199 par => [], 2556 par => [],
… …
2214 2571
2215 $self->{fontsize} = $fontsize; 2572 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2573 $self->reflow;
2217} 2574}
2218 2575
2219sub text_height {
2220 my ($self, $text) = @_;
2221
2222 my $layout = $self->{layout};
2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_markup ($text);
2227
2228 ($layout->size)[1]
2229}
2230
2231sub reflow {
2232 my ($self) = @_;
2233
2234 $self->{need_reflow}++;
2235 $self->update;
2236}
2237
2238sub size_allocate { 2576sub size_allocate {
2239 my ($self, $w, $h) = @_; 2577 my ($self, $w, $h) = @_;
2240 2578
2241 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2242 2580
2243 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2244 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2245 $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});
2246 2585
2247 $self->reflow; 2586 $self->reflow;
2248} 2587}
2249 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
2250sub add_paragraph { 2624sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2625 my ($self, $color, $text, $indent) = @_;
2252 2626
2253 #TODO: intelligently "reformat" paragraph 2627 for my $line (split /\n/, $text) {
2254 2628 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2629 $self->{height} += $h;
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2631 }
2258 2632
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $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]);
2262 $self->{children}[1]->update;
2263} 2634}
2264 2635
2265sub update { 2636sub update {
2266 my ($self) = @_; 2637 my ($self) = @_;
2267 2638
… …
2269 2640
2270 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2271 2642
2272 delete $self->{texture}; 2643 delete $self->{texture};
2273 2644
2274 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647
2275 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2649 my $height = 0;
2277 2650
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2279 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 }
2280 2667
2281 $self->{height} = $height; 2668 $self->{height} = $height;
2282 2669
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2671
2285 delete $self->{texture}; 2672 delete $self->{texture};
2286 } 2673 }
2287 2674
2288 $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 {
2289 glClearColor 0, 0, 0, 0; 2676 glClearColor 0, 0, 0, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2291 2678
2292 glEnable GL_TEXTURE_2D;
2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2294
2295 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2296 2680
2297 my $y0 = $top; 2681 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2682 my $y1 = $top + $H;
2299 2683
2300 my $y = 0; 2684 my $y = 0;
2301 2685
2302 my $layout = $self->{layout}; 2686 my $layout = $self->{layout};
2303 2687
2304 $layout->set_font ($self->{font}) if $self->{font}; 2688 $layout->set_font ($self->{font}) if $self->{font};
2305 2689
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
2306 for my $par (@{$self->{par}}) { 2694 for my $par (@{$self->{par}}) {
2307 my $h = $par->[0]; 2695 my $h = $par->[1];
2308 2696
2309 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2310 $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});
2311 $layout->set_markup ($par->[2]); 2701 $layout->set_markup ($par->[4]);
2312 2702
2313 my ($W, $H) = $layout->size; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 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;
2315 } 2707 }
2316 2708
2317 $y += $h; 2709 $y += $h;
2318 } 2710 }
2319 2711
2320 glDisable GL_TEXTURE_2D; 2712 glDisable GL_BLEND;
2321 }; 2713 };
2322 }); 2714 });
2323} 2715}
2324 2716
2325sub _draw { 2717sub _draw {
2326 my ($self) = @_; 2718 my ($self) = @_;
2327 2719
2328 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2331 $self->{texture}->draw_quad_alpha_premultiplied (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});
2332 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2333 2725
2334 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2335 2727
… …
2385 2777
2386sub new { 2778sub new {
2387 my $class = shift; 2779 my $class = shift;
2388 2780
2389 my $self = $class->SUPER::new ( 2781 my $self = $class->SUPER::new (
2390 state => 0, 2782 state => 0,
2391 connect_activate => \&toggle_flopper, 2783 on_activate => \&toggle_flopper,
2392 @_ 2784 @_
2393 ); 2785 );
2394 2786
2395 if ($self->{state}) {
2396 $self->{state} = 0;
2397 $self->toggle_flopper;
2398 }
2399
2400 $self 2787 $self
2401} 2788}
2402 2789
2403sub toggle_flopper { 2790sub toggle_flopper {
2404 my ($self) = @_; 2791 my ($self) = @_;
2405 2792
2406 # TODO: use animation 2793 $self->{other}->toggle_visibility;
2407 if ($self->{state} = !$self->{state}) {
2408 $CFClient::UI::ROOT->add ($self->{other});
2409 $self->{other}->move ($self->coord2global (0, $self->{h}));
2410 $self->emit ("open");
2411 } else {
2412 $CFClient::UI::ROOT->remove ($self->{other});
2413 $self->emit ("close");
2414 }
2415
2416 $self->emit (changed => $self->{state});
2417} 2794}
2418 2795
2419############################################################################# 2796#############################################################################
2420 2797
2421package CFClient::UI::Tooltip; 2798package CFClient::UI::Tooltip;
… …
2434} 2811}
2435 2812
2436sub set_tooltip_from { 2813sub set_tooltip_from {
2437 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2438 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
2439 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2440 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2442 fontsize => 0.8, 2831 fontsize => 0.8,
2443 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2444 ellipsise => 0, 2833 ellipsise => 0,
2445 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2456 2845
2457sub size_allocate { 2846sub size_allocate {
2458 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2459 2848
2460 $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 });
2461} 2868}
2462 2869
2463sub _draw { 2870sub _draw {
2464 my ($self) = @_; 2871 my ($self) = @_;
2465 2872
… …
2482 glVertex $w, $h; 2889 glVertex $w, $h;
2483 glVertex $w, 0; 2890 glVertex $w, 0;
2484 glEnd; 2891 glEnd;
2485 2892
2486 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2487 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2488} 2896}
2489 2897
2490############################################################################# 2898#############################################################################
2491 2899
… …
2496use CFClient::OpenGL; 2904use CFClient::OpenGL;
2497 2905
2498sub new { 2906sub new {
2499 my $class = shift; 2907 my $class = shift;
2500 2908
2501 $class->SUPER::new ( 2909 my $self = $class->SUPER::new (
2502 aspect => 1, 2910 aspect => 1,
2911 can_events => 0,
2503 @_, 2912 @_,
2504 ) 2913 );
2914
2915 if ($self->{anim} && $self->{animspeed}) {
2916 Scalar::Util::weaken (my $widget = $self);
2917
2918 $self->{timer} = Event->timer (
2919 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2920 hard => 1,
2921 interval => $self->{animspeed},
2922 cb => sub {
2923 ++$widget->{frame};
2924 $widget->update;
2925 },
2926 );
2927 }
2928
2929 $self
2505} 2930}
2506 2931
2507sub size_request { 2932sub size_request {
2508 (32, 8) 2933 (32, 8)
2509} 2934}
2510 2935
2936sub update {
2937 my ($self) = @_;
2938
2939 return unless $self->{visible};
2940
2941 $self->SUPER::update;
2942}
2943
2511sub _draw { 2944sub _draw {
2512 my ($self) = @_; 2945 my ($self) = @_;
2513 2946
2514 return unless $::CONN;#d# manage and cache textures differently 2947 return unless $::CONN;
2948
2949 my $face;
2950
2951 if ($self->{frame}) {
2952 my $anim = $::CONN->{anim}[$self->{anim}];
2953
2954 $face = $anim->[ $self->{frame} % @$anim ]
2955 if $anim && @$anim;
2956 }
2957
2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516 2959
2517 # TODO animation
2518 if ($tex) { 2960 if ($tex) {
2519 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2524 } 2966 }
2525} 2967}
2526 2968
2969sub destroy {
2970 my ($self) = @_;
2971
2972 $self->{timer}->cancel
2973 if $self->{timer};
2974
2975 $self->SUPER::destroy;
2976}
2977
2527############################################################################# 2978#############################################################################
2528 2979
2529package CFClient::UI::InventoryItem; 2980package CFClient::UI::Buttonbar;
2530 2981
2531our @ISA = CFClient::UI::HBox::; 2982our @ISA = CFClient::UI::HBox::;
2532 2983
2533sub _item_to_desc { 2984# TODO: should actualyl wrap buttons and other goodies.
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2558
2559sub new {
2560 my $class = shift;
2561
2562 my %args = @_;
2563
2564 my $item = delete $args{item};
2565
2566 my $desc = _item_to_desc ($item);
2567
2568 my $self = $class->SUPER::new (
2569 can_hover => 1,
2570 can_events => 1,
2571 tooltip => ((CFClient::UI::Label::escape $desc)
2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2573 connect_button_down => sub {
2574 my ($self, $ev, $x, $y) = @_;
2575
2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2584 $::CONN->send ("move $targ $item->{tag} 0");
2585 } elsif ($ev->{button} == 2) {
2586 $::CONN->send ("apply $item->{tag}");
2587 } elsif ($ev->{button} == 3) {
2588 my @menu_items = (
2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593 [
2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595 sub { $::CONN->send ("lock $item->{tag}") },
2596 ],
2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600 }
2601
2602 1
2603 },
2604 %args
2605 );
2606
2607
2608 $self->add (new CFClient::UI::Face
2609 can_events => 0,
2610 face => $item->{face},
2611 anim => $item->{anim},
2612 animspeed => $item->{animspeed},
2613 );
2614
2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2616
2617 $self->{item} = $item;
2618
2619 $self->update_item;
2620
2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2630}
2631
2632#############################################################################
2633
2634package CFClient::UI::Inventory;
2635
2636our @ISA = CFClient::UI::ScrolledWindow::;
2637
2638sub new {
2639 my $class = shift;
2640
2641 my $self = $class->SUPER::new (
2642 scrolled => (new CFClient::UI::VBox),
2643 @_,
2644 );
2645
2646 $self
2647}
2648
2649sub set_items {
2650 my ($self, $items) = @_;
2651
2652 $self->{scrolled}->clear;
2653 return unless $items;
2654
2655 my @items = sort {
2656 ($a->{type} <=> $b->{type})
2657 or ($a->{name} cmp $b->{name})
2658 } @$items;
2659
2660 $self->{real_items} = \@items;
2661
2662 for my $item (@items) {
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2665 }
2666
2667 $self->{scrolled}->add (@items);
2668
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2670}
2671
2672sub size_request {
2673 my ($self) = @_;
2674 ($self->{req_w}, $self->{req_h});
2675}
2676 2985
2677############################################################################# 2986#############################################################################
2678 2987
2679package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2680 2989
… …
2692 ); 3001 );
2693 3002
2694 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2695 3004
2696 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2697 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2698 3007
2699 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2700 if (!ref $widget) { 3009 if (!ref $widget) {
2701 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2702 can_hover => 1, 3011 can_hover => 1,
2703 can_events => 1, 3012 can_events => 1,
2704 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2705 } 3015 }
2706 3016
2707 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2708 3018
2709 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2714 3024
2715# 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)
2716sub popup { 3026sub popup {
2717 my ($self, $ev) = @_; 3027 my ($self, $ev) = @_;
2718 3028
2719 $self->emit ("popdown"); 3029 $self->_emit ("popdown");
2720 3030
2721 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2722 $GRAB = $self; 3032 $GRAB = $self;
2723 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2724 3034
2725 $self->show; 3035 $self->show;
2726 $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);
2727} 3037}
2728 3038
2729sub mouse_motion { 3039sub mouse_motion {
2730 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2731 3041
2732 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2733 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2734 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2735} 3047}
2736 3048
2737sub button_up { 3049sub button_up {
2738 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2739 3051
2740 if ($ev->{button} == $self->{button}) { 3052 if ($ev->{button} == $self->{button}) {
2741 undef $GRAB; 3053 undef $GRAB;
2742 $self->hide; 3054 $self->hide;
2743 3055
2744 $self->emit ("popdown"); 3056 $self->_emit ("popdown");
2745 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2746 } 3062 1
2747} 3063}
2748 3064
2749############################################################################# 3065#############################################################################
2750 3066
2751package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2752 3068
2753our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2754 3070
2755sub new { 3071sub new {
2756 my $class = shift; 3072 my $class = shift;
2757 3073
2758 $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 (
2759 fontsize => 0.8, 3239 fontsize => 0.8,
2760 @_, 3240 @_,
2761 ) 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
2762} 3248}
2763 3249
2764sub reorder { 3250sub reorder {
2765 my ($self) = @_; 3251 my ($self) = @_;
2766 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} };
2767 3258
2768 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2769 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2770 } 3261 }
2771 3262
… …
2774 my @items = sort { 3265 my @items = sort {
2775 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2776 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2777 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2778 3269
3270 $self->{timer}->interval (1);
3271
2779 my $count = 10 + 1; 3272 my $count = 10 + 1;
2780 for my $item (@items) { 3273 for my $item (@items) {
2781 last unless --$count; 3274 last unless --$count;
2782 3275
2783 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2784 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2785 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2786 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2787 : $item->{text}; 3280 : $item->{text};
2788 3281
… …
2796 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2797 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2798 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2799 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2800 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2801 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2802 can_events => 1, 3295 can_events => 1,
2803 can_hover => 1 3296 can_hover => 1
2804 }; 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;
2805 } 3310 }
2806 3311
2807 $self->clear; 3312 $self->clear;
2808 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2809} 3314}
… …
2812 my ($self, $text, %arg) = @_; 3317 my ($self, $text, %arg) = @_;
2813 3318
2814 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2816 3321
3322 return unless $text;
3323
2817 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2818 3325
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820 3327
2821 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2822 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2823 $item->{count}++; 3330 $item->{count}++;
2824 } else { 3331 } else {
2825 $item->{count} = 1; 3332 $item->{count} = 1;
2826 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2827 } 3334 }
2828 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2829 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2830 delete $item->{label}; 3337 delete $item->{label};
2831 } else { 3338 } else {
2832 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2833 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
2852 3359
2853 $self->reorder; 3360 $self->reorder;
2854 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2855} 3362}
2856 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2857############################################################################# 3372#############################################################################
2858 3373
2859package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
2860 3375
2861our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
2862
2863use CFClient::OpenGL;
2864 3377
2865sub new { 3378sub new {
2866 my $class = shift; 3379 my $class = shift;
2867 3380
2868 $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 => [],
2869 @_, 3624 @_,
2870 ) 3625 )
2871} 3626}
2872 3627
2873sub configure { 3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2874 my ($self, $x, $y, $w, $h) = @_;
2875 3629
2876 $self->{w} = $w; 3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2877 $self->{h} = $h; 3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2878} 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");
2879 3640
2880sub 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 {
2881 my ($self) = @_; 3714 my ($self, $spell) = @_;
2882 3715
2883 $self->size_allocate ($self->{w}, $self->{h}) 3716 $self->{spell}->{$spell->{name}} = $spell;
2884 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
2885} 3755}
2886 3756
2887sub size_request { 3757sub size_request {
2888 my ($self) = @_; 3758 my ($self) = @_;
2889 3759
2890 ($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
2891} 3775}
2892 3776
2893sub size_allocate { 3777sub size_allocate {
2894 my ($self, $w, $h) = @_; 3778 my ($self, $w, $h) = @_;
2895 3779
2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901
2902 for my $child ($self->children) { 3780 for my $child ($self->children) {
2903 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)};
2904 3782
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3783 $X = $child->{force_x} if exists $child->{force_x};
2906 if exists $child->{req_x}; 3784 $Y = $child->{force_y} if exists $child->{force_y};
2907 3785
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3786 $X = _to_pixel $X, $W, $self->{w};
2909 if exists $child->{req_y}; 3787 $Y = _to_pixel $Y, $H, $self->{h};
2910
2911 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913 3788
2914 $child->configure ($X, $Y, $W, $H); 3789 $child->configure ($X, $Y, $W, $H);
2915 } 3790 }
2916} 3791}
2917 3792
… …
2928} 3803}
2929 3804
2930sub update { 3805sub update {
2931 my ($self) = @_; 3806 my ($self) = @_;
2932 3807
2933 $self->check_size;
2934 $::WANT_REFRESH++; 3808 $::WANT_REFRESH++;
2935} 3809}
2936 3810
2937sub add { 3811sub add {
2938 my ($self, @children) = @_; 3812 my ($self, @children) = @_;
2939 3813
2940 for my $child (@children) {
2941 $child->{toplevel} = 1; 3814 $_->{is_toplevel} = 1
2942 3815 for @children;
2943 # integerise window positions
2944 $child->{x} = int $child->{x};
2945 $child->{y} = int $child->{y};
2946 }
2947 3816
2948 $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 }
2949} 3833}
2950 3834
2951sub on_refresh { 3835sub on_refresh {
2952 my ($self, $id, $cb) = @_; 3836 my ($self, $id, $cb) = @_;
2953 3837
… …
2966 while ($self->{refresh_hook}) { 3850 while ($self->{refresh_hook}) {
2967 $_->() 3851 $_->()
2968 for values %{delete $self->{refresh_hook}}; 3852 for values %{delete $self->{refresh_hook}};
2969 } 3853 }
2970 3854
2971 if ($self->{check_size}) { 3855 if ($self->{realloc}) {
2972 my @queue = ([], []); 3856 my %queue;
3857 my @queue;
3858 my $widget;
2973 3859
2974 for (;;) { 3860 outer:
2975 if ($self->{check_size}) { 3861 while () {
2976 # heuristic: check containers last 3862 if (my $realloc = delete $self->{realloc}) {
2977 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3863 for $widget (values %$realloc) {
2978 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 }
2979 } 3870 }
2980 3871
2981 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3872 while () {
3873 @queue or last outer;
2982 3874
2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3875 $widget = pop @{ $queue[-1] || [] }
2984 ? @$widget{qw(user_w user_h)} 3876 and last;
2985 : $widget->size_request;
2986
2987 if (delete $widget->{force_alloc}
2988 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2989 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2990 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}) {
2991 $widget->{req_w} = $w; 3896 $widget->{req_w} = $w;
2992 $widget->{req_h} = $h; 3897 $widget->{req_h} = $h;
2993 3898
2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3899 $self->{size_alloc}{$widget+0} = $widget;
2995 3900
2996 $widget->{parent}->check_size
2997 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 }
2998 } 3908 }
3909
3910 delete $self->{realloc}{$widget+0};
2999 } 3911 }
3000 } 3912 }
3001 3913
3002 while ($self->{size_alloc}) { 3914 while (my $size_alloc = delete $self->{size_alloc}) {
3003 for (values %{delete $self->{size_alloc}}) { 3915 my @queue = sort { $b->{visible} <=> $a->{visible} }
3004 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)};
3005 3922
3006 $w = 0 if $w < 0; 3923 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0; 3924 $h = 0 if $h < 0;
3008 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
3009 $widget->{w} = $w; 3933 $widget->{w} = $w;
3010 $widget->{h} = $h; 3934 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h); 3935
3012 $widget->emit (size_allocate => $w, $h); 3936 $widget->emit (size_allocate => $w, $h);
3937 }
3013 } 3938 }
3014 } 3939 }
3015 3940
3016 while ($self->{post_alloc_hook}) { 3941 while ($self->{post_alloc_hook}) {
3017 $_->() 3942 $_->()
3018 for values %{delete $self->{post_alloc_hook}}; 3943 for values %{delete $self->{post_alloc_hook}};
3019 } 3944 }
3020 3945
3946
3021 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023 glClear GL_COLOR_BUFFER_BIT; 3949 glClear GL_COLOR_BUFFER_BIT;
3024 3950
3025 glMatrixMode GL_PROJECTION; 3951 glMatrixMode GL_PROJECTION;
3026 glLoadIdentity; 3952 glLoadIdentity;
3027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028 glMatrixMode GL_MODELVIEW; 3954 glMatrixMode GL_MODELVIEW;
3029 glLoadIdentity; 3955 glLoadIdentity;
3030 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
3031 $self->_draw; 3964 $self->_draw;
3032} 3965}
3033 3966
3034############################################################################# 3967#############################################################################
3035 3968

Diff Legend

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