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

Diff Legend

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