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.171 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.284 by root, Mon Jun 5 03:06:04 2006 UTC

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

Diff Legend

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