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.201 by root, Sat May 13 23:17:49 2006 UTC vs.
Revision 1.292 by root, Tue Jun 6 03:02:15 2006 UTC

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

Diff Legend

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