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

Diff Legend

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