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.290 by root, Mon Jun 5 22:30:35 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 => ...
1254 @_ 1696 @_
1255 ) 1697 )
1256} 1698}
1257 1699
1258sub _set_text { 1700sub _set_text {
… …
1260 1702
1261 delete $self->{cur_h}; 1703 delete $self->{cur_h};
1262 1704
1263 return if $self->{text} eq $text; 1705 return if $self->{text} eq $text;
1264 1706
1265 delete $self->{texture};
1266
1267 $self->{last_activity} = $::NOW; 1707 $self->{last_activity} = $::NOW;
1268 $self->{text} = $text; 1708 $self->{text} = $text;
1269 1709
1270 $text =~ s/./*/g if $self->{hidden}; 1710 $text =~ s/./*/g if $self->{hidden};
1271 $self->{layout}->set_text ("$text "); 1711 $self->{layout}->set_text ("$text ");
1712 delete $self->{size_req};
1272 1713
1273 $self->emit (changed => $self->{text}); 1714 $self->_emit (changed => $self->{text});
1715
1716 $self->realloc;
1717 $self->update;
1718}
1719
1720sub set_text {
1721 my ($self, $text) = @_;
1722
1723 $self->{cursor} = length $text;
1724 $self->_set_text ($text);
1274} 1725}
1275 1726
1276sub get_text { 1727sub get_text {
1277 $_[0]{text} 1728 $_[0]{text}
1278} 1729}
… …
1281 my ($self) = @_; 1732 my ($self) = @_;
1282 1733
1283 my ($w, $h) = $self->SUPER::size_request; 1734 my ($w, $h) = $self->SUPER::size_request;
1284 1735
1285 ($w + 1, $h) # add 1 for cursor 1736 ($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} 1737}
1301 1738
1302sub key_down { 1739sub key_down {
1303 my ($self, $ev) = @_; 1740 my ($self, $ev) = @_;
1304 1741
… …
1306 my $sym = $ev->{sym}; 1743 my $sym = $ev->{sym};
1307 my $uni = $ev->{unicode}; 1744 my $uni = $ev->{unicode};
1308 1745
1309 my $text = $self->get_text; 1746 my $text = $self->get_text;
1310 1747
1311 if ($sym == 8) { 1748 if ($uni == 8) {
1312 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1749 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1313 } elsif ($sym == 127) { 1750 } elsif ($uni == 127) {
1314 substr $text, $self->{cursor}, 1, ""; 1751 substr $text, $self->{cursor}, 1, "";
1315 } elsif ($sym == CFClient::SDLK_LEFT) { 1752 } elsif ($sym == CFClient::SDLK_LEFT) {
1316 --$self->{cursor} if $self->{cursor}; 1753 --$self->{cursor} if $self->{cursor};
1317 } elsif ($sym == CFClient::SDLK_RIGHT) { 1754 } elsif ($sym == CFClient::SDLK_RIGHT) {
1318 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1755 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1319 } elsif ($sym == CFClient::SDLK_HOME) { 1756 } elsif ($sym == CFClient::SDLK_HOME) {
1320 $self->{cursor} = 0; 1757 $self->{cursor} = 0;
1321 } elsif ($sym == CFClient::SDLK_END) { 1758 } elsif ($sym == CFClient::SDLK_END) {
1322 $self->{cursor} = length $text; 1759 $self->{cursor} = length $text;
1323 } elsif ($sym == 27) { 1760 } elsif ($uni == 27) {
1324 $self->emit ('escape'); 1761 $self->_emit ('escape');
1325 } elsif ($uni) { 1762 } elsif ($uni) {
1326 substr $text, $self->{cursor}++, 0, chr $uni; 1763 substr $text, $self->{cursor}++, 0, chr $uni;
1764 } else {
1765 return 0;
1327 } 1766 }
1328 1767
1329 $self->_set_text ($text); 1768 $self->_set_text ($text);
1330 $self->update; 1769
1770 $self->realloc;
1771
1772 1
1331} 1773}
1332 1774
1333sub focus_in { 1775sub focus_in {
1334 my ($self) = @_; 1776 my ($self) = @_;
1335 1777
… …
1350 utf8::encode $text; 1792 utf8::encode $text;
1351 $self->{cursor} = length substr $text, 0, $idx; 1793 $self->{cursor} = length substr $text, 0, $idx;
1352 1794
1353 $self->_set_text ($self->{text}); 1795 $self->_set_text ($self->{text});
1354 $self->update; 1796 $self->update;
1797
1798 1
1355} 1799}
1356 1800
1357sub mouse_motion { 1801sub mouse_motion {
1358 my ($self, $ev, $x, $y) = @_; 1802 my ($self, $ev, $x, $y) = @_;
1359# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1803# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1804
1805 0
1360} 1806}
1361 1807
1362sub _draw { 1808sub _draw {
1363 my ($self) = @_; 1809 my ($self) = @_;
1364 1810
1365 local $self->{fg} = $self->{fg}; 1811 local $self->{fg} = $self->{fg};
1366 1812
1367 if ($FOCUS == $self) { 1813 if ($FOCUS == $self) {
1368 glColor @{$self->{active_bg}}; 1814 glColor_premultiply @{$self->{active_bg}};
1369 $self->{fg} = $self->{active_fg}; 1815 $self->{fg} = $self->{active_fg};
1370 } else { 1816 } else {
1371 glColor @{$self->{bg}}; 1817 glColor_premultiply @{$self->{bg}};
1372 } 1818 }
1373 1819
1374 glEnable GL_BLEND; 1820 glEnable GL_BLEND;
1375 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1821 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1376 glBegin GL_QUADS; 1822 glBegin GL_QUADS;
1377 glVertex 0 , 0; 1823 glVertex 0 , 0;
1378 glVertex 0 , $self->{h}; 1824 glVertex 0 , $self->{h};
1379 glVertex $self->{w}, $self->{h}; 1825 glVertex $self->{w}, $self->{h};
1380 glVertex $self->{w}, 0; 1826 glVertex $self->{w}, 0;
… …
1411 my ($self, $ev) = @_; 1857 my ($self, $ev) = @_;
1412 1858
1413 my $sym = $ev->{sym}; 1859 my $sym = $ev->{sym};
1414 1860
1415 if ($sym == 13) { 1861 if ($sym == 13) {
1862 unshift @{$self->{history}},
1863 my $txt = $self->get_text;
1864 $self->{history_pointer} = -1;
1865 $self->{history_saveback} = '';
1416 $self->emit (activate => $self->get_text); 1866 $self->_emit (activate => $txt);
1417 $self->update; 1867 $self->update;
1418 1868
1869 } elsif ($sym == CFClient::SDLK_UP) {
1870 if ($self->{history_pointer} < 0) {
1871 $self->{history_saveback} = $self->get_text;
1872 }
1873 if (@{$self->{history} || []} > 0) {
1874 $self->{history_pointer}++;
1875 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1876 $self->{history_pointer} = @{$self->{history} || []} - 1;
1877 }
1878 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1879 }
1880
1881 } elsif ($sym == CFClient::SDLK_DOWN) {
1882 $self->{history_pointer}--;
1883 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1884
1885 if ($self->{history_pointer} >= 0) {
1886 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1887 } else {
1888 $self->set_text ($self->{history_saveback});
1889 }
1890
1419 } else { 1891 } else {
1420 $self->SUPER::key_down ($ev); 1892 return $self->SUPER::key_down ($ev)
1893 }
1894
1421 } 1895 1
1422
1423} 1896}
1424 1897
1425############################################################################# 1898#############################################################################
1426 1899
1427package CFClient::UI::Button; 1900package CFClient::UI::Button;
… …
1436 1909
1437sub new { 1910sub new {
1438 my $class = shift; 1911 my $class = shift;
1439 1912
1440 $class->SUPER::new ( 1913 $class->SUPER::new (
1441 padding => 4, 1914 padding_x => 4,
1915 padding_y => 4,
1442 fg => [1, 1, 1], 1916 fg => [1, 1, 1],
1443 bg => [1, 1, 1, 0.2],
1444 active_fg => [0, 0, 1], 1917 active_fg => [0, 0, 1],
1445 can_hover => 1, 1918 can_hover => 1,
1446 align => 0, 1919 align => 0,
1447 valign => 0, 1920 valign => 0,
1448 can_events => 1, 1921 can_events => 1,
1449 @_ 1922 @_
1450 ) 1923 )
1451} 1924}
1452 1925
1926sub activate { }
1927
1453sub button_up { 1928sub button_up {
1454 my ($self, $ev, $x, $y) = @_; 1929 my ($self, $ev, $x, $y) = @_;
1455 1930
1931 $self->emit ("activate")
1456 if ($x >= 0 && $x < $self->{w} 1932 if $x >= 0 && $x < $self->{w}
1457 && $y >= 0 && $y < $self->{h}) { 1933 && $y >= 0 && $y < $self->{h};
1458 $self->emit ("activate"); 1934
1459 } 1935 1
1460} 1936}
1461 1937
1462sub _draw { 1938sub _draw {
1463 my ($self) = @_; 1939 my ($self) = @_;
1464 1940
1465 local $self->{fg} = $self->{fg}; 1941 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1466 1942
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; 1943 glEnable GL_TEXTURE_2D;
1474 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1944 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1475 glColor 0, 0, 0, 1; 1945 glColor 0, 0, 0, 1;
1476 1946
1477 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1947 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1478 1948
1479 glDisable GL_TEXTURE_2D; 1949 glDisable GL_TEXTURE_2D;
1480 glDisable GL_BLEND;
1481 1950
1482 $self->SUPER::_draw; 1951 $self->SUPER::_draw;
1483} 1952}
1484 1953
1485############################################################################# 1954#############################################################################
… …
1496 1965
1497sub new { 1966sub new {
1498 my $class = shift; 1967 my $class = shift;
1499 1968
1500 $class->SUPER::new ( 1969 $class->SUPER::new (
1501 padding => 2, 1970 padding_x => 2,
1971 padding_y => 2,
1502 fg => [1, 1, 1], 1972 fg => [1, 1, 1],
1503 active_fg => [1, 1, 0], 1973 active_fg => [1, 1, 0],
1974 bg => [0, 0, 0, 0.2],
1975 active_bg => [1, 1, 1, 0.5],
1504 state => 0, 1976 state => 0,
1505 can_hover => 1, 1977 can_hover => 1,
1506 @_ 1978 @_
1507 ) 1979 )
1508} 1980}
1509 1981
1510sub size_request { 1982sub size_request {
1511 my ($self) = @_; 1983 my ($self) = @_;
1512 1984
1513 ($self->{padding} * 2 + 6) x 2 1985 (6) x 2
1514} 1986}
1515 1987
1516sub button_down { 1988sub button_down {
1517 my ($self, $ev, $x, $y) = @_; 1989 my ($self, $ev, $x, $y) = @_;
1518 1990
1519 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1991 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1520 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1992 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1521 $self->{state} = !$self->{state}; 1993 $self->{state} = !$self->{state};
1522 $self->emit (changed => $self->{state}); 1994 $self->_emit (changed => $self->{state});
1995 } else {
1996 return 0
1997 }
1998
1523 } 1999 1
1524} 2000}
1525 2001
1526sub _draw { 2002sub _draw {
1527 my ($self) = @_; 2003 my ($self) = @_;
1528 2004
1529 $self->SUPER::_draw; 2005 $self->SUPER::_draw;
1530 2006
1531 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2007 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1532 2008
1533 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2009 my ($w, $h) = @$self{qw(w h)};
2010
2011 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1534 2012
1535 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2013 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1536 2014
1537 glEnable GL_BLEND; 2015 my $tex = $self->{state} ? $tex[1] : $tex[0];
2016
1538 glEnable GL_TEXTURE_2D; 2017 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); 2018 $tex->draw_quad_alpha (0, 0, $s, $s);
1544
1545 glDisable GL_TEXTURE_2D; 2019 glDisable GL_TEXTURE_2D;
1546 glDisable GL_BLEND;
1547} 2020}
1548 2021
1549############################################################################# 2022#############################################################################
1550 2023
1551package CFClient::UI::Image; 2024package CFClient::UI::Image;
… …
1594 glTranslate 0, -$self->{w}, 0; 2067 glTranslate 0, -$self->{w}, 0;
1595 2068
1596 ($w, $h) = ($h, $w); 2069 ($w, $h) = ($h, $w);
1597 } 2070 }
1598 2071
1599 glEnable GL_BLEND;
1600 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601 glEnable GL_TEXTURE_2D; 2072 glEnable GL_TEXTURE_2D;
1602 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2073 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1603 2074
1604 $tex->draw_quad (0, 0, $w, $h); 2075 $tex->draw_quad_alpha (0, 0, $w, $h);
1605 2076
1606 glDisable GL_BLEND;
1607 glDisable GL_TEXTURE_2D; 2077 glDisable GL_TEXTURE_2D;
1608} 2078}
1609 2079
1610############################################################################# 2080#############################################################################
1611 2081
… …
1659} 2129}
1660 2130
1661sub set_max { 2131sub set_max {
1662 my ($self, $max) = @_; 2132 my ($self, $max) = @_;
1663 2133
2134 return if $self->{max_val} == $max;
2135
1664 $self->{max_val} = $max; 2136 $self->{max_val} = $max;
2137 $self->update;
1665} 2138}
1666 2139
1667sub set_value { 2140sub set_value {
1668 my ($self, $val, $max) = @_; 2141 my ($self, $val, $max) = @_;
1669 2142
1670 $self->set_max ($max) 2143 $self->set_max ($max)
1671 if defined $max; 2144 if defined $max;
1672 2145
1673 $max = $self->{max_val}; 2146 return if $self->{val} == $val;
2147
1674 $self->{val} = $val; 2148 $self->{val} = $val;
1675
1676 $self->update; 2149 $self->update;
1677} 2150}
1678 2151
1679sub _draw { 2152sub _draw {
1680 my ($self) = @_; 2153 my ($self) = @_;
… …
1698 2171
1699 my $h1 = $self->{h} * (1 - $ycut1); 2172 my $h1 = $self->{h} * (1 - $ycut1);
1700 my $h2 = $self->{h} * (1 - $ycut2); 2173 my $h2 = $self->{h} * (1 - $ycut2);
1701 2174
1702 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2177 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 2178 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2179 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 2180
1707 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2181 glBindTexture GL_TEXTURE_2D, $t1->{name};
1708 glBegin GL_QUADS; 2182 glBegin GL_QUADS;
… …
1743 2217
1744sub new { 2218sub new {
1745 my ($class, %arg) = @_; 2219 my ($class, %arg) = @_;
1746 2220
1747 my $self = $class->SUPER::new ( 2221 my $self = $class->SUPER::new (
1748 tooltip => $arg{type}, 2222 tooltip => $arg{type},
2223 can_hover => 1,
2224 can_events => 1,
1749 %arg, 2225 %arg,
1750 ); 2226 );
1751 2227
1752 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2228 $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); 2229 $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); 2230 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755 2231
1756 $self 2232 $self
1757} 2233}
1758 2234
1759sub set_fontsize { 2235sub set_fontsize {
… …
1761 2237
1762 $self->{value}->set_fontsize ($fsize); 2238 $self->{value}->set_fontsize ($fsize);
1763 $self->{max} ->set_fontsize ($fsize); 2239 $self->{max} ->set_fontsize ($fsize);
1764} 2240}
1765 2241
2242sub set_max {
2243 my ($self, $max) = @_;
2244
2245 $self->{gauge}->set_max ($max);
2246 $self->{max}->set_text ($max);
2247}
2248
1766sub set_value { 2249sub set_value {
1767 my ($self, $val, $max) = @_; 2250 my ($self, $val, $max) = @_;
1768 2251
1769 $self->set_max ($max) 2252 $self->set_max ($max)
1770 if defined $max; 2253 if defined $max;
1771 2254
1772 $self->{gauge}->set_value ($val, $max); 2255 $self->{gauge}->set_value ($val, $max);
1773 $self->{value}->set_text ($val); 2256 $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} 2257}
1782 2258
1783############################################################################# 2259#############################################################################
1784 2260
1785package CFClient::UI::Slider; 2261package CFClient::UI::Slider;
… …
1795 qw(s1_slider.png s1_slider_bg.png); 2271 qw(s1_slider.png s1_slider_bg.png);
1796 2272
1797sub new { 2273sub new {
1798 my $class = shift; 2274 my $class = shift;
1799 2275
1800 # range [value, low, high, page] 2276 # range [value, low, high, page, unit]
1801 2277
1802 # TODO: 0-width page 2278 # TODO: 0-width page
1803 # TODO: req_w/h are wrong with vertical 2279 # TODO: req_w/h are wrong with vertical
1804 # TODO: calculations are off 2280 # TODO: calculations are off
1805 my $self = $class->SUPER::new ( 2281 my $self = $class->SUPER::new (
1806 fg => [1, 1, 1], 2282 fg => [1, 1, 1],
1807 active_fg => [0, 0, 0], 2283 active_fg => [0, 0, 0],
2284 bg => [0, 0, 0, 0.2],
2285 active_bg => [1, 1, 1, 0.5],
1808 range => [0, 0, 100, 10], 2286 range => [0, 0, 100, 10, 0],
1809 req_w => 20, 2287 min_w => $::WIDTH / 80,
1810 req_h => 20, 2288 min_h => $::WIDTH / 80,
1811 vertical => 0, 2289 vertical => 0,
1812 can_hover => 1, 2290 can_hover => 1,
1813 inner_pad => 5, 2291 inner_pad => 0.02,
1814 @_ 2292 @_
1815 ); 2293 );
1816 2294
2295 $self->set_value ($self->{range}[0]);
2296 $self->update;
2297
1817 $self 2298 $self
1818} 2299}
1819 2300
2301sub changed { }
2302
2303sub set_range {
2304 my ($self, $range) = @_;
2305
2306 ($range, $self->{range}) = ($self->{range}, $range);
2307
2308 $self->update
2309 if "@$range" ne "@{$self->{range}}";
2310}
2311
2312sub set_value {
2313 my ($self, $value) = @_;
2314
2315 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2316
2317 $hi = $lo + 1 if $hi <= $lo;
2318
2319 $page = $hi - $lo if $page > $hi - $lo;
2320
2321 $value = $lo if $value < $lo;
2322 $value = $hi - $page if $value > $hi - $page;
2323
2324 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2325 if $unit;
2326
2327 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2328
2329 if ($value != $old_value) {
2330 $self->_emit (changed => $value);
2331 $self->update;
2332 }
2333}
2334
1820sub size_request { 2335sub size_request {
1821 my ($self) = @_; 2336 my ($self) = @_;
1822 2337
1823 my $w = $self->{req_w}; 2338 ($self->{req_w}, $self->{req_h})
1824 my $h = $self->{req_h};
1825
1826 $self->{vertical} ? ($h, $w) : ($w, $h)
1827} 2339}
1828 2340
1829sub button_down { 2341sub button_down {
1830 my ($self, $ev, $x, $y) = @_; 2342 my ($self, $ev, $x, $y) = @_;
1831 2343
1832 $self->SUPER::button_down ($ev, $x, $y); 2344 $self->SUPER::button_down ($ev, $x, $y);
2345
2346 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2347
1833 $self->mouse_motion ($ev, $x, $y); 2348 $self->mouse_motion ($ev, $x, $y)
1834} 2349}
1835 2350
1836sub mouse_motion { 2351sub mouse_motion {
1837 my ($self, $ev, $x, $y) = @_; 2352 my ($self, $ev, $x, $y) = @_;
1838 2353
1839 if ($GRAB == $self) { 2354 if ($GRAB == $self) {
2355 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2356
2357 my (undef, $lo, $hi, $page) = @{$self->{range}};
2358
2359 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2360
2361 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2362 } else {
2363 return 0;
2364 }
2365
2366 1
2367}
2368
2369sub update {
2370 my ($self) = @_;
2371
2372 delete $self->{knob_w};
2373 $self->SUPER::update;
2374}
2375
2376sub _draw {
2377 my ($self) = @_;
2378
2379 unless ($self->{knob_w}) {
2380 $self->set_value ($self->{range}[0]);
2381
1840 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2382 my ($value, $lo, $hi, $page) = @{$self->{range}};
2383 my $range = ($hi - $page - $lo) || 1e-100;
1841 2384
1842 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2385 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1843 2386
1844 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2387 $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 2388 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1846 2389
1847 $x -= $inner_pad_px; # substract the padding 2390 $value = ($value - $lo) / $range;
1848 $x = $x * ($hi - $lo) / $inner_w + $lo; 2391 $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 2392
1853 $self->emit (changed => $x); 2393 $self->{knob_x} = $value - $knob_w * 0.5;
1854 $self->update; 2394 $self->{knob_w} = $knob_w;
1855 } 2395 }
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 2396
1869 $self->SUPER::_draw (); 2397 $self->SUPER::_draw ();
1870 2398
1871 my ($w, $h) = @$self{qw(w h)}; 2399 glScale $self->{w}, $self->{h};
1872 2400
1873 if ($self->{vertical}) { 2401 if ($self->{vertical}) {
1874 # draw a vertical slider like a rotated horizontal slider 2402 # draw a vertical slider like a rotated horizontal slider
1875 2403
2404 glTranslate 1, 0, 0;
1876 glRotate 90, 0, 0, 1; 2405 glRotate 90, 0, 0, 1;
1877 glTranslate 0, -$self->{w}, 0;
1878
1879 ($w, $h) = ($h, $w);
1880 } 2406 }
1881 2407
1882 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2408 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1883 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2409 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1884 2410
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; 2411 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 2413
1908 # draw background 2414 # draw background
1909 $tex[1]->draw_quad (0, 0, $w, $h); 2415 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1910 2416
1911 # draw handle 2417 # draw handle
1912 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2418 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1913 2419
1914 glDisable GL_BLEND;
1915 glDisable GL_TEXTURE_2D; 2420 glDisable GL_TEXTURE_2D;
1916} 2421}
2422
2423#############################################################################
2424
2425package CFClient::UI::ValSlider;
2426
2427our @ISA = CFClient::UI::HBox::;
2428
2429sub new {
2430 my ($class, %arg) = @_;
2431
2432 my $range = delete $arg{range};
2433
2434 my $self = $class->SUPER::new (
2435 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2436 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2437 to_value => sub { shift },
2438 from_value => sub { shift },
2439 %arg,
2440 );
2441
2442 $self->{slider}->connect (changed => sub {
2443 my ($self, $value) = @_;
2444 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2445 $self->{parent}->emit (changed => $value);
2446 });
2447
2448# $self->{entry}->connect (changed => sub {
2449# my ($self, $value) = @_;
2450# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2451# $self->{parent}->emit (changed => $value);
2452# });
2453
2454 $self->add ($self->{slider}, $self->{entry});
2455
2456 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2457
2458 $self
2459}
2460
2461sub set_range { shift->{slider}->set_range (@_) }
2462sub set_value { shift->{slider}->set_value (@_) }
1917 2463
1918############################################################################# 2464#############################################################################
1919 2465
1920package CFClient::UI::TextView; 2466package CFClient::UI::TextView;
1921 2467
… …
1925 2471
1926sub new { 2472sub new {
1927 my $class = shift; 2473 my $class = shift;
1928 2474
1929 my $self = $class->SUPER::new ( 2475 my $self = $class->SUPER::new (
1930 fontsize => 1, 2476 fontsize => 1,
2477 can_events => 0,
1931 #font => default_font 2478 #font => default_font
1932 @_, 2479 @_,
1933 2480
1934 layout => (new CFClient::Layout), 2481 layout => (new CFClient::Layout 1),
1935 par => [], 2482 par => [],
1936 height => 0, 2483 height => 0,
1937 children => [ 2484 children => [
1938 (new CFClient::UI::Empty expand => 1), 2485 (new CFClient::UI::Empty expand => 1),
1939 (new CFClient::UI::Slider vertical => 1), 2486 (new CFClient::UI::Slider vertical => 1),
1940 ], 2487 ],
1941 ); 2488 );
1942 2489
1943 $self->{children}[1]->connect (changed => sub { 2490 $self->{children}[1]->connect (changed => sub { $self->update });
1944 $self->update;
1945 });
1946 2491
1947 $self 2492 $self
1948} 2493}
1949 2494
1950sub set_fontsize { 2495sub set_fontsize {
1951 my ($self, $fontsize) = @_; 2496 my ($self, $fontsize) = @_;
1952 2497
1953 $self->{fontsize} = $fontsize; 2498 $self->{fontsize} = $fontsize;
1954 $self->reflow; 2499 $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} 2500}
1975 2501
1976sub size_allocate { 2502sub size_allocate {
1977 my ($self, $w, $h) = @_; 2503 my ($self, $w, $h) = @_;
1978 2504
… …
1983 $self->{layout}->set_width ($self->{children}[0]{w}); 2509 $self->{layout}->set_width ($self->{children}[0]{w});
1984 2510
1985 $self->reflow; 2511 $self->reflow;
1986} 2512}
1987 2513
2514sub text_size {
2515 my ($self, $text, $indent) = @_;
2516
2517 my $layout = $self->{layout};
2518
2519 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2520 $layout->set_width ($self->{children}[0]{w} - $indent);
2521 $layout->set_markup ($text);
2522
2523 $layout->size
2524}
2525
2526sub reflow {
2527 my ($self) = @_;
2528
2529 $self->{need_reflow}++;
2530 $self->update;
2531}
2532
2533sub set_offset {
2534 my ($self, $offset) = @_;
2535
2536 # todo: base offset on lines or so, not on pixels
2537 $self->{children}[1]->set_value ($offset);
2538}
2539
2540sub clear {
2541 my ($self) = @_;
2542
2543 $self->{par} = [];
2544 $self->{height} = 0;
2545 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2546}
2547
1988sub add_paragraph { 2548sub add_paragraph {
1989 my ($self, $color, $text) = @_; 2549 my ($self, $color, $text, $indent) = @_;
1990 2550
1991 #TODO: intelligently "reformat" paragraph 2551 for my $line (split /\n/, $text) {
1992 2552 my ($w, $h) = $self->text_size ($line);
1993 my $height = $self->text_height ($text);
1994
1995 $self->{height} += $height; 2553 $self->{height} += $h;
2554 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2555 }
1996 2556
1997 push @{$self->{par}}, [$height, $color, $text];
1998
1999 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2557 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2000 $self->{children}[1]->update;
2001} 2558}
2002 2559
2003sub update { 2560sub update {
2004 my ($self) = @_; 2561 my ($self) = @_;
2005 2562
… …
2007 2564
2008 return unless $self->{h} > 0; 2565 return unless $self->{h} > 0;
2009 2566
2010 delete $self->{texture}; 2567 delete $self->{texture};
2011 2568
2012 $ROOT->on_refresh ($self, sub { 2569 $ROOT->on_post_alloc ($self, sub {
2570 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2571
2013 if (delete $self->{need_reflow}) { 2572 if (delete $self->{need_reflow}) {
2014 my $height = 0; 2573 my $height = 0;
2015 2574
2016 $height += $_->[0] = $self->text_height ($_->[2]) 2575 my $layout = $self->{layout};
2576
2577 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2578
2017 for @{$self->{par}}; 2579 for (@{$self->{par}}) {
2580 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2581 $layout->set_width ($W - $_->[3]);
2582 $layout->set_markup ($_->[4]);
2583 my ($w, $h) = $layout->size;
2584 $_->[0] = $w + $_->[3];
2585 $_->[1] = $h;
2586 }
2587
2588 $height += $_->[1];
2589 }
2018 2590
2019 $self->{height} = $height; 2591 $self->{height} = $height;
2020 2592
2021 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2593 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2022 2594
2023 delete $self->{texture}; 2595 delete $self->{texture};
2024 } 2596 }
2025 2597
2026 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2027 glClearColor 0, 0, 0, 1; 2599 glClearColor 0, 0, 0, 0;
2028 glClear GL_COLOR_BUFFER_BIT; 2600 glClear GL_COLOR_BUFFER_BIT;
2029 2601
2602 my $top = int $self->{children}[1]{range}[0];
2603
2604 my $y0 = $top;
2605 my $y1 = $top + $H;
2606
2607 my $y = 0;
2608
2609 my $layout = $self->{layout};
2610
2611 $layout->set_font ($self->{font}) if $self->{font};
2612
2030 glEnable GL_BLEND; 2613 glEnable GL_BLEND;
2614 #TODO# not correct in windows where rgba is forced off
2031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2615 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 2616
2046 for my $par (@{$self->{par}}) { 2617 for my $par (@{$self->{par}}) {
2047 my $h = $par->[0]; 2618 my $h = $par->[1];
2048 2619
2049 if ($y0 < $y + $h && $y < $y1) { 2620 if ($y0 < $y + $h && $y < $y1) {
2621 $layout->set_foreground (@{ $par->[2] });
2622 $layout->set_width ($W - $par->[3]);
2050 $layout->set_text ($par->[2]); 2623 $layout->set_markup ($par->[4]);
2051 2624
2052 glColor @{ $par->[1] }; 2625 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2053 my ($W, $H) = $layout->size; 2626
2054 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2627 glRasterPos $par->[3], $y - $y0;
2628 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2055 } 2629 }
2056 2630
2057 $y += $h; 2631 $y += $h;
2058 } 2632 }
2059 2633
2060 glDisable GL_TEXTURE_2D;
2061 glDisable GL_BLEND; 2634 glDisable GL_BLEND;
2062 }; 2635 };
2063 }); 2636 });
2064} 2637}
2065 2638
2066sub _draw { 2639sub _draw {
2067 my ($self) = @_; 2640 my ($self) = @_;
2068 2641
2069 if ($self->{texture}) {
2070 glEnable GL_TEXTURE_2D; 2642 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2644 glColor 0, 0, 0, 1;
2645 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2073 glDisable GL_TEXTURE_2D; 2646 glDisable GL_TEXTURE_2D;
2074 }
2075 2647
2076 $self->{children}[1]->draw; 2648 $self->{children}[1]->draw;
2077 2649
2078} 2650}
2079 2651
… …
2127 2699
2128sub new { 2700sub new {
2129 my $class = shift; 2701 my $class = shift;
2130 2702
2131 my $self = $class->SUPER::new ( 2703 my $self = $class->SUPER::new (
2132 state => 0, 2704 state => 0,
2133 connect_activate => \&toggle_flopper, 2705 on_activate => \&toggle_flopper,
2134 can_events => 1,
2135 @_ 2706 @_
2136 ); 2707 );
2137 2708
2138 if ($self->{state}) {
2139 $self->{state} = 0;
2140 $self->toggle_flopper;
2141 }
2142
2143 $self 2709 $self
2144} 2710}
2145 2711
2146sub toggle_flopper { 2712sub toggle_flopper {
2147 my ($self) = @_; 2713 my ($self) = @_;
2148 2714
2149 # TODO: use animation 2715 $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} 2716}
2161 2717
2162############################################################################# 2718#############################################################################
2163 2719
2164package CFClient::UI::Tooltip; 2720package CFClient::UI::Tooltip;
… …
2174 @_, 2730 @_,
2175 can_events => 0, 2731 can_events => 0,
2176 ) 2732 )
2177} 2733}
2178 2734
2179sub set_text { 2735sub set_tooltip_from {
2180 my ($self, $text) = @_; 2736 my ($self, $widget) = @_;
2181 2737
2182 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2738 my $tooltip = $widget->{tooltip};
2183 $self->{label}->set_text ($text); 2739
2184 $self->add ($self->{label}); 2740 if ($ENV{CFPLUS_DEBUG} & 2) {
2741 $tooltip .= "\n\n" . (ref $widget) . "\n"
2742 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2743 . "req $widget->{req_w} $widget->{req_h}\n"
2744 . "visible $widget->{visible}";
2745 }
2746
2747 $self->add (new CFClient::UI::Label
2748 markup => $tooltip,
2749 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2750 fontsize => 0.8,
2751 fg => [0, 0, 0, 1],
2752 ellipsise => 0,
2753 font => ($widget->{tooltip_font} || $::FONT_PROP),
2754 );
2185} 2755}
2186 2756
2187sub size_request { 2757sub size_request {
2188 my ($self) = @_; 2758 my ($self) = @_;
2189 2759
2190 $self->child->set_max_size ($::WIDTH * 0.2);
2191
2192 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2760 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193 2761
2194 ($w + 4, $h + 4) 2762 ($w + 4, $h + 4)
2195} 2763}
2196 2764
2765sub size_allocate {
2766 my ($self, $w, $h) = @_;
2767
2768 $self->SUPER::size_allocate ($w - 4, $h - 4);
2769}
2770
2771sub visibility_change {
2772 my ($self, $visible) = @_;
2773
2774 return unless $visible;
2775
2776 $self->{root}->on_post_alloc ("move_$self" => sub {
2777 my $widget = $self->{owner}
2778 or return;
2779
2780 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781
2782 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783 if $x + $self->{w} > $::WIDTH;
2784
2785 $self->move_abs ($x, $y);
2786 });
2787}
2788
2197sub _draw { 2789sub _draw {
2198 my ($self) = @_; 2790 my ($self) = @_;
2199 2791
2200 glPushMatrix;
2201 glTranslate 0.375, 0.375; 2792 glTranslate 0.375, 0.375;
2202 2793
2203 my ($w, $h) = @$self{qw(w h)}; 2794 my ($w, $h) = @$self{qw(w h)};
2204 2795
2205 glColor 1, 0.8, 0.4; 2796 glColor 1, 0.8, 0.4;
… …
2216 glVertex 0 , $h; 2807 glVertex 0 , $h;
2217 glVertex $w, $h; 2808 glVertex $w, $h;
2218 glVertex $w, 0; 2809 glVertex $w, 0;
2219 glEnd; 2810 glEnd;
2220 2811
2221 glPopMatrix; 2812 glTranslate 2 - 0.375, 2 - 0.375;
2222 2813
2223 glTranslate 2, 2;
2224 $self->SUPER::_draw; 2814 $self->SUPER::_draw;
2225} 2815}
2226 2816
2227############################################################################# 2817#############################################################################
2228 2818
2819package CFClient::UI::Face;
2820
2821our @ISA = CFClient::UI::Base::;
2822
2823use CFClient::OpenGL;
2824
2825sub new {
2826 my $class = shift;
2827
2828 my $self = $class->SUPER::new (
2829 aspect => 1,
2830 can_events => 0,
2831 @_,
2832 );
2833
2834 if ($self->{anim} && $self->{animspeed}) {
2835 Scalar::Util::weaken (my $widget = $self);
2836
2837 $self->{timer} = Event->timer (
2838 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2839 hard => 1,
2840 interval => $self->{animspeed},
2841 cb => sub {
2842 ++$widget->{frame};
2843 $widget->update;
2844 },
2845 );
2846 }
2847
2848 $self
2849}
2850
2851sub size_request {
2852 (32, 8)
2853}
2854
2855sub update {
2856 my ($self) = @_;
2857
2858 return unless $self->{visible};
2859
2860 $self->SUPER::update;
2861}
2862
2863sub _draw {
2864 my ($self) = @_;
2865
2866 return unless $::CONN;
2867
2868 my $face;
2869
2870 if ($self->{frame}) {
2871 my $anim = $::CONN->{anim}[$self->{anim}];
2872
2873 $face = $anim->[ $self->{frame} % @$anim ]
2874 if $anim && @$anim;
2875 }
2876
2877 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2878
2879 if ($tex) {
2880 glEnable GL_TEXTURE_2D;
2881 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2882 glColor 0, 0, 0, 1;
2883 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2884 glDisable GL_TEXTURE_2D;
2885 }
2886}
2887
2888sub DESTROY {
2889 my ($self) = @_;
2890
2891 $self->{timer}->cancel
2892 if $self->{timer};
2893
2894 $self->SUPER::DESTROY;
2895}
2896
2897#############################################################################
2898
2899package CFClient::UI::Buttonbar;
2900
2901our @ISA = CFClient::UI::HBox::;
2902
2903# TODO: should actualyl wrap buttons and other goodies.
2904
2905#############################################################################
2906
2907package CFClient::UI::Menu;
2908
2909our @ISA = CFClient::UI::FancyFrame::;
2910
2911use CFClient::OpenGL;
2912
2913sub new {
2914 my $class = shift;
2915
2916 my $self = $class->SUPER::new (
2917 items => [],
2918 z => 100,
2919 @_,
2920 );
2921
2922 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2923
2924 for my $item (@{ $self->{items} }) {
2925 my ($widget, $cb) = @$item;
2926
2927 # handle various types of items, only text for now
2928 if (!ref $widget) {
2929 $widget = new CFClient::UI::Label
2930 can_hover => 1,
2931 can_events => 1,
2932 text => $widget;
2933 }
2934
2935 $self->{item}{$widget} = $item;
2936
2937 $self->{vbox}->add ($widget);
2938 }
2939
2940 $self
2941}
2942
2943# popup given the event (must be a mouse button down event currently)
2944sub popup {
2945 my ($self, $ev) = @_;
2946
2947 $self->_emit ("popdown");
2948
2949 # maybe save $GRAB? must be careful about events...
2950 $GRAB = $self;
2951 $self->{button} = $ev->{button};
2952
2953 $self->show;
2954 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2955}
2956
2957sub mouse_motion {
2958 my ($self, $ev, $x, $y) = @_;
2959
2960 # TODO: should use vbox->find_widget or so
2961 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2962 $self->{hover} = $self->{item}{$HOVER};
2963
2964 0
2965}
2966
2967sub button_up {
2968 my ($self, $ev, $x, $y) = @_;
2969
2970 if ($ev->{button} == $self->{button}) {
2971 undef $GRAB;
2972 $self->hide;
2973
2974 $self->_emit ("popdown");
2975 $self->{hover}[1]->() if $self->{hover};
2976 } else {
2977 return 0
2978 }
2979
2980 1
2981}
2982
2983#############################################################################
2984
2985package CFClient::UI::Multiplexer;
2986
2987our @ISA = CFClient::UI::Container::;
2988
2989sub new {
2990 my $class = shift;
2991
2992 my $self = $class->SUPER::new (
2993 @_,
2994 );
2995
2996 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} };
2998
2999 $self
3000}
3001
3002sub add {
3003 my ($self, @widgets) = @_;
3004
3005 $self->SUPER::add (@widgets);
3006
3007 $self->{current} = $self->{children}[0]
3008 if @{ $self->{children} };
3009}
3010
3011sub set_current_page {
3012 my ($self, $page_or_widget) = @_;
3013
3014 my $widget = ref $page_or_widget
3015 ? $page_or_widget
3016 : $self->{children}[$page_or_widget];
3017
3018 $self->{current} = $widget;
3019 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3020
3021 $self->_emit (page_changed => $self->{current});
3022
3023 $self->realloc;
3024}
3025
3026sub visible_children {
3027 $_[0]{current}
3028}
3029
3030sub size_request {
3031 my ($self) = @_;
3032
3033 $self->{current}->size_request
3034}
3035
3036sub size_allocate {
3037 my ($self, $w, $h) = @_;
3038
3039 $self->{current}->configure (0, 0, $w, $h);
3040}
3041
3042sub _draw {
3043 my ($self) = @_;
3044
3045 $self->{current}->draw;
3046}
3047
3048#############################################################################
3049
3050package CFClient::UI::Notebook;
3051
3052our @ISA = CFClient::UI::VBox::;
3053
3054sub new {
3055 my $class = shift;
3056
3057 my $self = $class->SUPER::new (
3058 buttonbar => (new CFClient::UI::Buttonbar),
3059 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3060 # filter => # will be put between multiplexer and $self
3061 @_,
3062 );
3063
3064 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3065 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3066
3067 $self
3068}
3069
3070sub add {
3071 my ($self, $title, $widget, $tooltip) = @_;
3072
3073 Scalar::Util::weaken $self;
3074
3075 $self->{buttonbar}->add (new CFClient::UI::Button
3076 markup => $title,
3077 tooltip => $tooltip,
3078 on_activate => sub { $self->set_current_page ($widget) },
3079 );
3080
3081 $self->{multiplexer}->add ($widget);
3082}
3083
3084sub set_current_page {
3085 my ($self, $page) = @_;
3086
3087 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current});
3089}
3090
3091#############################################################################
3092
3093package CFClient::UI::Statusbox;
3094
3095our @ISA = CFClient::UI::VBox::;
3096
3097sub new {
3098 my $class = shift;
3099
3100 my $self = $class->SUPER::new (
3101 fontsize => 0.8,
3102 @_,
3103 );
3104
3105 Scalar::Util::weaken (my $this = $self);
3106
3107 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3108
3109 $self
3110}
3111
3112sub reorder {
3113 my ($self) = @_;
3114 my $NOW = Time::HiRes::time;
3115
3116 # freeze display when hovering over any label
3117 return if $CFClient::UI::TOOLTIP->{owner}
3118 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3119 values %{ $self->{item} };
3120
3121 while (my ($k, $v) = each %{ $self->{item} }) {
3122 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3123 }
3124
3125 my @widgets;
3126
3127 my @items = sort {
3128 $a->{pri} <=> $b->{pri}
3129 or $b->{id} <=> $a->{id}
3130 } values %{ $self->{item} };
3131
3132 $self->{timer}->interval (1);
3133
3134 my $count = 10 + 1;
3135 for my $item (@items) {
3136 last unless --$count;
3137
3138 my $label = $item->{label} ||= do {
3139 # TODO: doesn't handle markup well (read as: at all)
3140 my $short = $item->{count} > 1
3141 ? "<b>$item->{count} ×</b> $item->{text}"
3142 : $item->{text};
3143
3144 for ($short) {
3145 s/^\s+//;
3146 s/\s+/ /g;
3147 }
3148
3149 new CFClient::UI::Label
3150 markup => $short,
3151 tooltip => $item->{tooltip},
3152 tooltip_font => $::FONT_PROP,
3153 tooltip_width => 0.67,
3154 fontsize => $item->{fontsize} || $self->{fontsize},
3155 max_w => $::WIDTH * 0.44,
3156 fg => [@{ $item->{fg} }],
3157 can_events => 1,
3158 can_hover => 1
3159 };
3160
3161 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3162 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3163 $label->update;
3164 $label->set_max_size (undef, $label->{req_h} * $diff)
3165 if $diff < 1;
3166 $self->{timer}->interval (1/30);
3167 } else {
3168 $label->{fg}[3] = $item->{fg}[3] || 1;
3169 }
3170
3171 push @widgets, $label;
3172 }
3173
3174 $self->clear;
3175 $self->SUPER::add (reverse @widgets);
3176}
3177
3178sub add {
3179 my ($self, $text, %arg) = @_;
3180
3181 $text =~ s/^\s+//;
3182 $text =~ s/\s+$//;
3183
3184 return unless $text;
3185
3186 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3187
3188 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3189
3190 if (my $item = $self->{item}{$group}) {
3191 if ($item->{text} eq $text) {
3192 $item->{count}++;
3193 } else {
3194 $item->{count} = 1;
3195 $item->{text} = $item->{tooltip} = $text;
3196 }
3197 $item->{id} = ++$self->{id};
3198 $item->{timeout} = $timeout;
3199 delete $item->{label};
3200 } else {
3201 $self->{item}{$group} = {
3202 id => ++$self->{id},
3203 text => $text,
3204 timeout => $timeout,
3205 tooltip => $text,
3206 fg => [0.8, 0.8, 0.8, 0.8],
3207 pri => 0,
3208 count => 1,
3209 %arg,
3210 };
3211 }
3212
3213 $self->reorder;
3214}
3215
3216sub reconfigure {
3217 my ($self) = @_;
3218
3219 delete $_->{label}
3220 for values %{ $self->{item} || {} };
3221
3222 $self->reorder;
3223 $self->SUPER::reconfigure;
3224}
3225
3226sub DESTROY {
3227 my ($self) = @_;
3228
3229 $self->{timer}->cancel;
3230
3231 $self->SUPER::DESTROY;
3232}
3233
3234#############################################################################
3235
3236package CFClient::UI::Inventory;
3237
3238our @ISA = CFClient::UI::ScrolledWindow::;
3239
3240sub new {
3241 my $class = shift;
3242
3243 my $self = $class->SUPER::new (
3244 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3245 @_,
3246 );
3247
3248 $self
3249}
3250
3251sub set_items {
3252 my ($self, $items) = @_;
3253
3254 $self->{child}->clear;
3255 return unless $items;
3256
3257 my @items = sort {
3258 ($a->{type} <=> $b->{type})
3259 or ($a->{name} cmp $b->{name})
3260 } @$items;
3261
3262 $self->{real_items} = \@items;
3263
3264 my $row = 0;
3265 for my $item (@items) {
3266 CFClient::Item::update_widgets $item;
3267
3268 $self->{child}->add (0, $row, $item->{face_widget});
3269 $self->{child}->add (1, $row, $item->{desc_widget});
3270 $self->{child}->add (2, $row, $item->{weight_widget});
3271
3272 $row++;
3273 }
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::BindEditor;
3279
3280our @ISA = CFClient::UI::FancyFrame::;
3281
3282sub new {
3283 my $class = shift;
3284
3285 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3286
3287 $self->add (my $vb = new CFClient::UI::VBox);
3288
3289
3290 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3291 text => "start recording",
3292 tooltip => "Start/Stops recording of actions."
3293 ."All subsequent actions after the recording started will be captured."
3294 ."The actions are displayed after the record was stopped."
3295 ."To bind the action you have to click on the 'Bind' button",
3296 on_activate => sub {
3297 unless ($self->{recording}) {
3298 $self->start;
3299 } else {
3300 $self->stop;
3301 }
3302 });
3303
3304 $vb->add (new CFClient::UI::Label text => "Actions:");
3305 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3306
3307 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3310 $hb->add (new CFClient::UI::Button
3311 text => "bind",
3312 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3313 on_activate => sub {
3314 $self->ask_for_bind;
3315 });
3316
3317 $vb->add (my $hb = new CFClient::UI::HBox);
3318 $hb->add (new CFClient::UI::Button
3319 text => "ok",
3320 expand => 1,
3321 tooltip => "This closes the binding editor and saves the binding",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->commit;
3325 });
3326
3327 $hb->add (new CFClient::UI::Button
3328 text => "cancel",
3329 expand => 1,
3330 tooltip => "This closes the binding editor without saving",
3331 on_activate => sub {
3332 $self->hide;
3333 $self->{binding_cancel}->()
3334 if $self->{binding_cancel};
3335 });
3336
3337 $self->update_binding_widgets;
3338
3339 $self
3340}
3341
3342sub commit {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 if ($sym != 0 && @$cmds > 0) {
3346 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3347 ."'. Don't forget 'Save Config'!");
3348 $self->{binding_change}->($mod, $sym, $cmds)
3349 if $self->{binding_change};
3350 } else {
3351 $::STATUSBOX->add ("No action bound, no key or action specified!");
3352 $self->{binding_cancel}->()
3353 if $self->{binding_cancel};
3354 }
3355}
3356
3357sub start {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("stop recording");
3361 $self->{recording} = 1;
3362 $self->clear_command_list;
3363 $::CONN->start_record if $::CONN;
3364}
3365
3366sub stop {
3367 my ($self) = @_;
3368
3369 $self->{rec_btn}->set_text ("start recording");
3370 $self->{recording} = 0;
3371
3372 my $rec;
3373 $rec = $::CONN->stop_record if $::CONN;
3374 return unless ref $rec eq 'ARRAY';
3375 $self->set_command_list ($rec);
3376}
3377
3378
3379sub ask_for_bind_and_commit {
3380 my ($self) = @_;
3381 $self->ask_for_bind (1);
3382}
3383
3384sub ask_for_bind {
3385 my ($self, $commit) = @_;
3386
3387 CFClient::Binder::open_binding_dialog (sub {
3388 my ($mod, $sym) = @_;
3389 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3390 $self->update_binding_widgets;
3391 $self->commit if $commit;
3392 });
3393}
3394
3395# $mod and $sym are the modifiers and key symbol
3396# $cmds is a array ref of strings (the commands)
3397# $cb is the callback that is executed on OK
3398# $ccb is the callback that is executed on CANCEL and
3399# when the binding was unsuccessful on OK
3400sub set_binding {
3401 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3402
3403 $self->clear_command_list;
3404 $self->{recording} = 0;
3405 $self->{rec_btn}->set_text ("start recording");
3406
3407 $self->{binding} = [$mod, $sym];
3408 $self->{commands} = $cmds;
3409
3410 $self->{binding_change} = $cb;
3411 $self->{binding_cancel} = $ccb;
3412
3413 $self->update_binding_widgets;
3414}
3415
3416# this is a shortcut method that asks for a binding
3417# and then just binds it.
3418sub do_quick_binding {
3419 my ($self, $cmds) = @_;
3420 $self->set_binding (undef, undef, $cmds, sub {
3421 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3422 });
3423 $self->ask_for_bind (1);
3424}
3425
3426sub update_binding_widgets {
3427 my ($self) = @_;
3428 my ($mod, $sym, $cmds) = $self->get_binding;
3429 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3430 $self->set_command_list ($cmds);
3431}
3432
3433sub get_binding {
3434 my ($self) = @_;
3435 return (
3436 $self->{binding}->[0],
3437 $self->{binding}->[1],
3438 [ grep { defined $_ } @{$self->{commands}} ]
3439 );
3440}
3441
3442sub clear_command_list {
3443 my ($self) = @_;
3444 $self->{cmdbox}->clear ();
3445}
3446
3447sub set_command_list {
3448 my ($self, $cmds) = @_;
3449
3450 $self->{cmdbox}->clear ();
3451 $self->{commands} = $cmds;
3452
3453 my $idx = 0;
3454
3455 for (@$cmds) {
3456 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3457
3458 my $i = $idx;
3459 $hb->add (new CFClient::UI::Label text => $_);
3460 $hb->add (new CFClient::UI::Button
3461 text => "delete",
3462 tooltip => "Deletes the action from the record",
3463 on_activate => sub {
3464 $self->{cmdbox}->remove ($hb);
3465 $cmds->[$i] = undef;
3466 });
3467
3468
3469 $idx++
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::SpellList;
3476
3477our @ISA = CFClient::UI::Table::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (
3483 binding => [],
3484 commands => [],
3485 @_,
3486 )
3487}
3488
3489my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3490 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3491my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3492 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3493my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3494 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3495
3496sub rebuild_spell_list {
3497 my ($self) = @_;
3498
3499 $CFClient::UI::ROOT->on_refresh ($self => sub {
3500 $self->clear;
3501
3502 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3503 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3504 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3505 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3506
3507 my $row = 0;
3508
3509 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510 my $spell = $self->{spell}{$_};
3511
3512 $row++;
3513
3514 $self->add (0, $row, new CFClient::UI::Face
3515 face => $spell->{face},
3516 can_hover => 1,
3517 can_events => 1,
3518 tooltip => $spell->{message},
3519 );
3520
3521 $self->add (1, $row, new CFClient::UI::Label
3522 expand => 1,
3523 text => $spell->{name},
3524 can_hover => 1,
3525 can_events => 1,
3526 tooltip => $spell->{message},
3527 );
3528
3529 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3530 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3531 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3532
3533 # TODO: should be done via popup
3534 $self->add (5, $row, new CFClient::UI::Button
3535 text => "bind",
3536 tooltip => "bind spell readying (cast command) to key",
3537 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538 );
3539 }
3540 });
3541}
3542
3543sub add_spell {
3544 my ($self, $spell) = @_;
3545
3546 $self->{spell}->{$spell->{name}} = $spell;
3547 $self->rebuild_spell_list;
3548}
3549
3550sub remove_spell {
3551 my ($self, $spell) = @_;
3552
3553 delete $self->{spell}->{$spell->{name}};
3554 $self->rebuild_spell_list;
3555}
3556
3557#############################################################################
3558
2229package CFClient::UI::Root; 3559package CFClient::UI::Root;
2230 3560
2231our @ISA = CFClient::UI::Container::; 3561our @ISA = CFClient::UI::Container::;
2232 3562
3563use List::Util qw(min max);
3564
2233use CFClient::OpenGL; 3565use CFClient::OpenGL;
2234 3566
2235sub check_size { 3567sub new {
2236 my ($self) = @_; 3568 my $class = shift;
2237 3569
2238 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3570 my $self = $class->SUPER::new (
3571 visible => 1,
3572 @_,
3573 );
3574
3575 Scalar::Util::weaken ($self->{root} = $self);
3576
3577 $self
2239} 3578}
2240 3579
2241sub size_request { 3580sub size_request {
2242 ($::WIDTH, $::HEIGHT) 3581 my ($self) = @_;
2243}
2244 3582
2245sub configure { 3583 ($self->{w}, $self->{h})
3584}
3585
3586sub _to_pixel {
3587 my ($coord, $size, $max) = @_;
3588
3589 $coord =
3590 $coord eq "center" ? ($max - $size) * 0.5
3591 : $coord eq "max" ? $max
3592 : $coord;
3593
3594 $coord = 0 if $coord < 0;
3595 $coord = $max - $size if $coord > $max - $size;
3596
3597 int $coord + 0.5
3598}
3599
3600sub size_allocate {
2246 my ($self, $x, $y, $w, $h) = @_; 3601 my ($self, $w, $h) = @_;
2247 3602
2248 $self->SUPER::configure ($x, $y, $w, $h);
2249
2250 for my $child (@{$self->{children}}) { 3603 for my $child ($self->children) {
2251 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3604 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2252 3605
2253 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3606 $X = $child->{force_x} if exists $child->{force_x};
2254 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3607 $Y = $child->{force_y} if exists $child->{force_y};
3608
3609 $X = _to_pixel $X, $W, $self->{w};
3610 $Y = _to_pixel $Y, $H, $self->{h};
3611
2255 $child->configure ($X, $Y, $W,$H); 3612 $child->configure ($X, $Y, $W, $H);
2256 } 3613 }
2257} 3614}
2258 3615
2259sub _topleft { 3616sub coord2local {
2260 my ($self, $x, $y) = @_; 3617 my ($self, $x, $y) = @_;
2261 3618
2262 ($x, $y) 3619 ($x, $y)
2263} 3620}
2264 3621
3622sub coord2global {
3623 my ($self, $x, $y) = @_;
3624
3625 ($x, $y)
3626}
3627
2265sub update { 3628sub update {
2266 my ($self) = @_; 3629 my ($self) = @_;
2267 3630
2268 $self->check_size; 3631 $::WANT_REFRESH++;
2269 ::refresh ();
2270} 3632}
2271 3633
2272sub add { 3634sub add {
2273 my ($self, $child) = @_; 3635 my ($self, @children) = @_;
2274 3636
2275 # integerize window positions 3637 $_->{is_toplevel} = 1
2276 $child->{x} = int $child->{x}; 3638 for @children;
2277 $child->{y} = int $child->{y};
2278 3639
2279 $self->SUPER::add ($child); 3640 $self->SUPER::add (@children);
3641}
3642
3643sub remove {
3644 my ($self, @children) = @_;
3645
3646 $self->SUPER::remove (@children);
3647
3648 delete $self->{is_toplevel}
3649 for @children;
3650
3651 while (@children) {
3652 my $w = pop @children;
3653 push @children, $w->children;
3654 $w->set_invisible;
3655 }
2280} 3656}
2281 3657
2282sub on_refresh { 3658sub on_refresh {
2283 my ($self, $id, $cb) = @_; 3659 my ($self, $id, $cb) = @_;
2284 3660
2285 $self->{refresh_hook}{$id} = $cb; 3661 $self->{refresh_hook}{$id} = $cb;
2286} 3662}
2287 3663
3664sub on_post_alloc {
3665 my ($self, $id, $cb) = @_;
3666
3667 $self->{post_alloc_hook}{$id} = $cb;
3668}
3669
2288sub draw { 3670sub draw {
2289 my ($self) = @_; 3671 my ($self) = @_;
2290 3672
2291 while (my $rcb = delete $self->{refresh_hook}) { 3673 while ($self->{refresh_hook}) {
2292 $_->() for values %$rcb; 3674 $_->()
3675 for values %{delete $self->{refresh_hook}};
2293 } 3676 }
3677
3678 if ($self->{realloc}) {
3679 my %queue;
3680 my @queue;
3681 my $widget;
3682
3683 outer:
3684 while () {
3685 if (my $realloc = delete $self->{realloc}) {
3686 for $widget (values %$realloc) {
3687 $widget->{visible} or next; # do not resize invisible widgets
3688
3689 $queue{$widget+0}++ and next; # duplicates are common
3690
3691 push @{ $queue[$widget->{visible}] }, $widget;
3692 }
3693 }
3694
3695 while () {
3696 @queue or last outer;
3697
3698 $widget = pop @{ $queue[-1] || [] }
3699 and last;
3700
3701 pop @queue;
3702 }
3703
3704 delete $queue{$widget+0};
3705
3706 my ($w, $h) = $widget->size_request;
3707
3708 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3709 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3710
3711 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3712 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3713
3714 $w = $widget->{force_w} if exists $widget->{force_w};
3715 $h = $widget->{force_h} if exists $widget->{force_h};
3716
3717 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3718 || delete $widget->{force_realloc}) {
3719 $widget->{req_w} = $w;
3720 $widget->{req_h} = $h;
3721
3722 $self->{size_alloc}{$widget+0} = $widget;
3723
3724 if (my $parent = $widget->{parent}) {
3725 $self->{realloc}{$parent+0} = $parent
3726 unless $queue{$parent+0};
3727
3728 $parent->{force_size_alloc} = 1;
3729 $self->{size_alloc}{$parent+0} = $parent;
3730 }
3731 }
3732
3733 delete $self->{realloc}{$widget+0};
3734 }
3735 }
3736
3737 while (my $size_alloc = delete $self->{size_alloc}) {
3738 my @queue = sort { $b->{visible} <=> $a->{visible} }
3739 values %$size_alloc;
3740
3741 while () {
3742 my $widget = pop @queue || last;
3743
3744 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3745
3746 $w = 0 if $w < 0;
3747 $h = 0 if $h < 0;
3748
3749 $w = int $w + 0.5;
3750 $h = int $h + 0.5;
3751
3752 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3753 $widget->{old_w} = $widget->{w};
3754 $widget->{old_h} = $widget->{h};
3755
3756 $widget->{w} = $w;
3757 $widget->{h} = $h;
3758
3759 $widget->emit (size_allocate => $w, $h);
3760 }
3761 }
3762 }
3763
3764 while ($self->{post_alloc_hook}) {
3765 $_->()
3766 for values %{delete $self->{post_alloc_hook}};
3767 }
3768
2294 3769
2295 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3770 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2296 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3771 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2297 glClear GL_COLOR_BUFFER_BIT; 3772 glClear GL_COLOR_BUFFER_BIT;
2298 3773
2299 glMatrixMode GL_PROJECTION; 3774 glMatrixMode GL_PROJECTION;
2300 glLoadIdentity; 3775 glLoadIdentity;
2301 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3776 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2302 glMatrixMode GL_MODELVIEW; 3777 glMatrixMode GL_MODELVIEW;
2303 glLoadIdentity; 3778 glLoadIdentity;
2304 3779
3780 {
3781 package CFClient::UI::Base;
3782
3783 ($draw_x, $draw_y, $draw_w, $draw_h) =
3784 (0, 0, $self->{w}, $self->{h});
3785 }
3786
2305 $self->_draw; 3787 $self->_draw;
2306} 3788}
2307 3789
2308############################################################################# 3790#############################################################################
2309 3791
2310package CFClient::UI; 3792package CFClient::UI;
2311 3793
2312$ROOT = new CFClient::UI::Root; 3794$ROOT = new CFClient::UI::Root;
2313$TOOLTIP = new CFClient::UI::Tooltip; 3795$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2314 3796
23151 37971
2316 3798

Diff Legend

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