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.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.291 by root, Tue Jun 6 02:55:50 2006 UTC

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

Diff Legend

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