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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines