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.200 by root, Sat May 13 00:27:09 2006 UTC vs.
Revision 1.304 by elmex, Tue Jun 13 11:01:04 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->{visible};
278 delete $self->{root};
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, List::Util::min $self->{root}{w} - $self->{w}, int $x;
197 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, 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
422 #$self->deactivate; 597 delete $WIDGET{$self+0};
598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
423} 601}
424 602
425############################################################################# 603#############################################################################
426 604
427package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
435 my $class = shift; 613 my $class = shift;
436 614
437 # range [value, low, high, page] 615 # range [value, low, high, page]
438 616
439 $class->SUPER::new ( 617 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 618 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 619 #active_bg => [1, 1, 1, 0.5],
442 @_ 620 @_
443 ) 621 )
444} 622}
445 623
446sub _draw { 624sub _draw {
447 my ($self) = @_; 625 my ($self) = @_;
448 626
627 my $color = $FOCUS == $self && $self->{active_bg}
628 ? $self->{active_bg}
629 : $self->{bg};
630
631 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
450 633
451 glEnable GL_BLEND; 634 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 636 glColor_premultiply @$color;
454 637
455 glBegin GL_QUADS; 638 glBegin GL_QUADS;
456 glVertex 0 , 0; 639 glVertex 0 , 0;
457 glVertex 0 , $h; 640 glVertex 0 , $h;
458 glVertex $w, $h; 641 glVertex $w, $h;
459 glVertex $w, 0; 642 glVertex $w, 0;
460 glEnd; 643 glEnd;
461 644
462 glDisable GL_BLEND; 645 glDisable GL_BLEND;
646 }
463} 647}
464 648
465############################################################################# 649#############################################################################
466 650
467package CFClient::UI::Empty; 651package CFClient::UI::Empty;
… …
472 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
474} 658}
475 659
476sub size_request { 660sub size_request {
477 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
478} 664}
479 665
480sub draw { } 666sub draw { }
481 667
482############################################################################# 668#############################################################################
… …
486our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
487 673
488sub new { 674sub new {
489 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
490 676
491 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
492 678
493 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
494 children => [], 680 children => [],
495 can_events => 0, 681 can_events => 0,
496 %arg, 682 %arg,
497 ); 683 );
684
498 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
499 687
500 $self 688 $self
501} 689}
502 690
503sub add { 691sub add {
… …
511 $self->{children} = [ 699 $self->{children} = [
512 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
513 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
514 ]; 702 ];
515 703
516 $self->check_size (1); 704 $self->realloc;
517 $self->update;
518} 705}
519 706
520sub children { 707sub children {
521 @{ $_[0]{children} } 708 @{ $_[0]{children} }
522} 709}
… …
527 delete $child->{parent}; 714 delete $child->{parent};
528 $child->hide; 715 $child->hide;
529 716
530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531 718
532 $self->check_size; 719 $self->realloc;
533 $self->update;
534} 720}
535 721
536sub clear { 722sub clear {
537 my ($self) = @_; 723 my ($self) = @_;
538 724
… …
542 for (@$children) { 728 for (@$children) {
543 delete $_->{parent}; 729 delete $_->{parent};
544 $_->hide; 730 $_->hide;
545 } 731 }
546 732
547 $self->check_size; 733 $self->realloc;
548 $self->update;
549} 734}
550 735
551sub find_widget { 736sub find_widget {
552 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
553 738
554 $x -= $self->{x}; 739 $x -= $self->{x};
555 $y -= $self->{y}; 740 $y -= $self->{y};
556 741
557 my $res; 742 my $res;
558 743
559 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
560 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
561 and return $res; 746 and return $res;
562 } 747 }
563 748
564 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
585} 770}
586 771
587sub add { 772sub add {
588 my ($self, $child) = @_; 773 my ($self, $child) = @_;
589 774
590 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
591
592 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
593} 777}
594 778
595sub remove { 779sub remove {
596 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
613 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
614} 798}
615 799
616############################################################################# 800#############################################################################
617 801
802# back-buffered drawing area
803
618package CFClient::UI::Window; 804package CFClient::UI::Window;
619 805
620our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
621 807
622use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
640 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
641 $self->update; 827 $self->update;
642} 828}
643 829
644sub _render { 830sub _render {
831 my ($self) = @_;
832
645 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
646} 834}
647 835
648sub render_child { 836sub render_child {
649 my ($self) = @_; 837 my ($self) = @_;
650 838
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
654 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
655 $self->_render; 850 $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 }; 851 };
664} 852}
665 853
666sub _draw { 854sub _draw {
667 my ($self) = @_; 855 my ($self) = @_;
668 856
669 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
670 858
671 my $tex = $self->{texture} 859 my $tex = $self->{texture}
672 or return; 860 or return;
673 861
674 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
… …
684 872
685package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
686 874
687our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
688 876
877sub new {
878 my $class = shift;
879
880 $class->SUPER::new (
881 scroll_x => 0,
882 scroll_y => 1,
883 @_,
884 )
885}
886
689sub size_request { 887sub size_request {
690 my ($self) = @_; 888 my ($self) = @_;
691 889
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 891
695 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
696} 896}
697 897
698sub size_allocate { 898sub size_allocate {
699 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
700 900
901 my $child = $self->child;
902
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905
906 $self->child->configure (0, 0, $w, $h);
701 $self->update; 907 $self->update;
702} 908}
703 909
704sub set_offset { 910sub set_offset {
705 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
… …
739} 945}
740 946
741sub _render { 947sub _render {
742 my ($self) = @_; 948 my ($self) = @_;
743 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745 954
746 $self->SUPER::_render; 955 $self->SUPER::_render;
747} 956}
748 957
… …
751package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
752 961
753our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
754 963
755sub new { 964sub new {
756 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
757 968
758 my $self; 969 my $self;
759 970
760 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
761 vertical => 1, 972 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 974 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 975 $self->{vp}->set_offset (0, $_[1]);
765 }, 976 },
766 ; 977 ;
767 978
768 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 980 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 981 slider => $slider,
771 @_, 982 %arg,
772 ); 983 );
773 984
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
777 987
778 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
995}
996
997sub update {
998 my ($self) = @_;
999
1000 $self->SUPER::update;
1001
1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005}
1006
1007sub size_allocate {
1008 my ($self, $w, $h) = @_;
1009
1010 $self->SUPER::size_allocate ($w, $h);
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
779} 1014}
780 1015
781#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 1017# update viewport offset on scroll
783 1018
… …
803 1038
804 if ($self->{bg}) { 1039 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
806 1041
807 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
809 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
810 1045
811 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
812 glVertex 0 , 0; 1047 glVertex 0 , 0;
813 glVertex 0 , $h; 1048 glVertex 0 , $h;
814 glVertex $w, $h; 1049 glVertex $w, $h;
… …
827 1062
828our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
829 1064
830use CFClient::OpenGL; 1065use CFClient::OpenGL;
831 1066
832my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 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); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
835 1074
836sub new { 1075sub new {
837 my $class = shift; 1076 my ($class, %arg) = @_;
838
839 # TODO: user_x, user_y, overwrite moveto?
840 1077
841 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
842 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
843 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
844 border => 0.6, 1081 border => 0.6,
845 can_events => 1, 1082 can_events => 1,
846 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
847 ); 1086 );
848 1087
849 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
850 align => 0, 1089 align => 0,
851 valign => 1, 1090 valign => 1,
852 text => $self->{title}, 1091 text => $self->{title},
853 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
854 1103
855 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
856} 1113}
857 1114
858sub border { 1115sub border {
859 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
860} 1117}
861 1118
862sub size_request { 1119sub size_request {
863 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
864 1127
865 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
866 1129
867 ( 1130 (
868 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
871} 1134}
872 1135
873sub size_allocate { 1136sub size_allocate {
874 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
875 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
876 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
877 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
878 1149
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); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
883} 1154}
884 1155
885sub button_down { 1156sub button_down {
886 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
887 1158
… …
903 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
904 1175
905 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
907 1178
908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
911 $self->check_size; 1183 $self->realloc;
912 }; 1184 };
913 1185
914 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
915 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
916 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
918 $self->{motion} = sub { 1190 $self->{motion} = sub {
919 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
920 1192
921 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
922 1194
923 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
924 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
925 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
926 } 1203 1
927} 1204}
928 1205
929sub button_up { 1206sub button_up {
930 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
931 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
932 delete $self->{motion}; 1212 !!delete $self->{motion}
933} 1213}
934 1214
935sub mouse_motion { 1215sub mouse_motion {
936 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
937 1217
938 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
939} 1221}
940 1222
941sub _draw { 1223sub _draw {
942 my ($self) = @_; 1224 my ($self) = @_;
943 1225
1226 my $child = $self->{children}[0];
1227
944 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
946 1230
947 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
949 1233
950 my $border = $self->border; 1234 my $border = $self->border;
951 1235
952 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
953 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
957 1241
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
959 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
960 1244
961 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
962 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
963 my $rep_y = $ch / $bg->{h}; 1248 $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); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 } 1250 }
972 1251
973 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
974 1253
975 $self->{title}->draw if $self->{title};
976
977 $self->child->draw; 1254 $child->draw;
1255
1256 if ($self->{title_widget}) {
1257 glTranslate 0, $border - $self->{h};
1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
978} 1265}
979 1266
980############################################################################# 1267#############################################################################
981 1268
982package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
990sub new { 1277sub new {
991 my $class = shift; 1278 my $class = shift;
992 1279
993 $class->SUPER::new ( 1280 $class->SUPER::new (
994 col_expand => [], 1281 col_expand => [],
995 @_ 1282 @_,
996 ) 1283 )
1284}
1285
1286sub children {
1287 grep $_, map @$_, grep $_, @{ $_[0]{children} }
997} 1288}
998 1289
999sub add { 1290sub add {
1000 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1001 1292
1002 $child->set_parent ($self); 1293 $child->set_parent ($self);
1003 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1004 1295
1005 $child->check_size; 1296 $self->realloc;
1006} 1297}
1007 1298
1008sub children { 1299sub remove {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1300 my ($self, $child) = @_;
1010}
1011 1301
1302 # TODO: not yet implemented
1303}
1304
1012# TODO: move to container class maybe? send childs a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1013sub clear { 1306sub clear {
1014 my ($self) = @_; 1307 my ($self) = @_;
1015 1308
1016 my @children = $self->children; 1309 my @children = $self->children;
1017 delete $self->{children}; 1310 delete $self->{children};
… …
1019 for (@children) { 1312 for (@children) {
1020 delete $_->{parent}; 1313 delete $_->{parent};
1021 $_->hide; 1314 $_->hide;
1022 } 1315 }
1023 1316
1024 $self->update; 1317 $self->realloc;
1025} 1318}
1026 1319
1027sub get_wh { 1320sub get_wh {
1028 my ($self) = @_; 1321 my ($self) = @_;
1029 1322
… …
1060sub size_allocate { 1353sub size_allocate {
1061 my ($self, $w, $h) = @_; 1354 my ($self, $w, $h) = @_;
1062 1355
1063 my ($ws, $hs) = $self->get_wh; 1356 my ($ws, $hs) = $self->get_wh;
1064 1357
1065 my $req_w = sum @$ws; 1358 my $req_w = (sum @$ws) || 1;
1066 my $req_h = sum @$hs; 1359 my $req_h = (sum @$hs) || 1;
1067 1360
1068 # TODO: nicer code && do row_expand 1361 # TODO: nicer code && do row_expand
1069 my @col_expand = @{$self->{col_expand}}; 1362 my @col_expand = @{$self->{col_expand}};
1070 @col_expand = (1) x @$ws unless @col_expand; 1363 @col_expand = (1) x @$ws unless @col_expand;
1071 my $col_expand = (sum @col_expand) || 1; 1364 my $col_expand = (sum @col_expand) || 1;
… …
1125 } 1418 }
1126} 1419}
1127 1420
1128############################################################################# 1421#############################################################################
1129 1422
1130package CFClient::UI::HBox; 1423package CFClient::UI::Box;
1131
1132# TODO: wrap into common Box base class
1133 1424
1134our @ISA = CFClient::UI::Container::; 1425our @ISA = CFClient::UI::Container::;
1135 1426
1136sub size_request { 1427sub size_request {
1137 my ($self) = @_; 1428 my ($self) = @_;
1138 1429
1139 my @alloc = map [$_->size_request], @{$self->{children}}; 1430 $self->{vertical}
1140 1431 ? (
1141 ( 1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1142 (List::Util::sum map $_->[0], @alloc), 1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1143 (List::Util::max map $_->[1], @alloc), 1434 )
1144 ) 1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1145} 1439}
1146 1440
1147sub size_allocate { 1441sub size_allocate {
1148 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1149 1443
1150 ($h, $w) = ($w, $h); 1444 my $space = $self->{vertical} ? $h : $w;
1151
1152 my $children = $self->{children}; 1445 my $children = $self->{children};
1153 1446
1154 my @h = map $_->{req_w}, @$children; 1447 my @req;
1155 1448
1156 my $req_h = List::Util::sum @h; 1449 if ($self->{homogeneous}) {
1157 1450 @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 { 1451 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1453 my $req = List::Util::sum @req;
1454
1455 if ($req > $space) {
1456 # ah well, not enough space
1457 $_ *= $space / $req for @req;
1458 } else {
1162 my $exp = List::Util::sum map $_->{expand}, @$children; 1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1163 $exp ||= 1;
1164 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children->[$_]{expand}
1165 for (0 .. $#$children) { 1464 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 } 1465 }
1172 } 1466 }
1173 1467
1174 CFClient::UI::harmonize \@h; 1468 CFClient::UI::harmonize \@req;
1175 1469
1176 my $y = 0; 1470 my $pos = 0;
1177 for (0 .. $#$children) { 1471 for (0 .. $#$children) {
1178 my $child = $children->[$_];
1179 my $h = $h[$_]; 1472 my $alloc = $req[$_];
1180 $child->configure ($y, 0, $h, $w); 1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1181 1474
1182 $y += $h; 1475 $pos += $alloc;
1183 } 1476 }
1184 1477
1185 1 1478 1
1186} 1479}
1187 1480
1188############################################################################# 1481#############################################################################
1189 1482
1483package CFClient::UI::HBox;
1484
1485our @ISA = CFClient::UI::Box::;
1486
1487sub new {
1488 my $class = shift;
1489
1490 $class->SUPER::new (
1491 vertical => 0,
1492 @_,
1493 )
1494}
1495
1496#############################################################################
1497
1190package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1191 1499
1192# TODO: wrap into common Box base class
1193
1194our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1195 1501
1196sub size_request { 1502sub new {
1197 my ($self) = @_; 1503 my $class = shift;
1198 1504
1199 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1200 1506 vertical => 1,
1201 ( 1507 @_,
1202 (List::Util::max map $_->[0], @alloc),
1203 (List::Util::sum map $_->[1], @alloc),
1204 ) 1508 )
1205} 1509}
1206 1510
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############################################################################# 1511#############################################################################
1247 1512
1248package CFClient::UI::Label; 1513package CFClient::UI::Label;
1249 1514
1250our @ISA = CFClient::UI::Base::; 1515our @ISA = CFClient::UI::DrawBG::;
1251 1516
1252use CFClient::OpenGL; 1517use CFClient::OpenGL;
1253 1518
1254sub new { 1519sub new {
1255 my ($class, %arg) = @_; 1520 my ($class, %arg) = @_;
1256 1521
1257 my $self = $class->SUPER::new ( 1522 my $self = $class->SUPER::new (
1258 fg => [1, 1, 1], 1523 fg => [1, 1, 1],
1524 #bg => none
1525 #active_bg => none
1259 #font => default_font 1526 #font => default_font
1260 #text => initial text 1527 #text => initial text
1261 #markup => initial narkup 1528 #markup => initial narkup
1529 #max_w => maximum pixel width
1530 ellipsise => 3, # end
1262 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1263 fontsize => 1, 1532 fontsize => 1,
1264 align => -1, 1533 align => -1,
1265 valign => -1, 1534 valign => -1,
1266 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1267 can_events => 0, 1537 can_events => 0,
1268 %arg 1538 %arg
1269 ); 1539 );
1270 1540
1271 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1281 } 1551 }
1282 1552
1283 $self 1553 $self
1284} 1554}
1285 1555
1286sub escape { 1556sub escape($) {
1287 local $_ = $_[1]; 1557 local $_ = $_[0];
1288 1558
1289 s/&/&amp;/g; 1559 s/&/&amp;/g;
1290 s/>/&gt;/g; 1560 s/>/&gt;/g;
1291 s/</&lt;/g; 1561 s/</&lt;/g;
1292 1562
1293 $_[1] 1563 $_
1294} 1564}
1295 1565
1296sub update { 1566sub update {
1297 my ($self) = @_; 1567 my ($self) = @_;
1298 1568
1299 delete $self->{texture}; 1569 delete $self->{texture};
1300 $self->SUPER::update; 1570 $self->SUPER::update;
1301} 1571}
1302 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1303sub set_text { 1580sub set_text {
1304 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1305 1582
1306 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1307 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1308 1585
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1310 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1311 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1312 $self->update; 1591 $self->update;
1313 $self->check_size;
1314} 1592}
1315 1593
1316sub set_markup { 1594sub set_markup {
1317 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1318 1596
… …
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323 1601
1324 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1326 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1327 $self->update; 1607 $self->update;
1328 $self->check_size;
1329} 1608}
1330 1609
1331sub size_request { 1610sub size_request {
1332 my ($self) = @_; 1611 my ($self) = @_;
1333 1612
1613 $self->{size_req} ||= do {
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1619
1338 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1339 1621
1340 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1341 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1342 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1625
1344 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1345 1627
1346 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1347 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1348 } 1633 };
1349 1634
1350 ( 1635 @{ $self->{size_req} }
1351 $w + $self->{padding} * 2,
1352 $h + $self->{padding} * 2,
1353 )
1354} 1636}
1355 1637
1356sub size_allocate { 1638sub size_allocate {
1357 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1358 1640
1641 delete $self->{ox};
1642
1359 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1360} 1645}
1361 1646
1362sub set_fontsize { 1647sub set_fontsize {
1363 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1364 1649
1365 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1366 delete $self->{texture}; 1651 delete $self->{texture};
1367 1652
1368 $self->update; 1653 $self->realloc;
1369 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1370} 1662}
1371 1663
1372sub _draw { 1664sub _draw {
1373 my ($self) = @_; 1665 my ($self) = @_;
1666
1667 $self->SUPER::_draw; # draw background, if applicable
1374 1668
1375 my $tex = $self->{texture} ||= do { 1669 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}}); 1670 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1671 $self->{layout}->set_font ($self->{font}) if $self->{font};
1378 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380 1676
1381 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 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 }; 1678 };
1393 1679
1680 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5);
1684
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5);
1688 };
1689
1394 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1396 1694
1397 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1398 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1399 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1400 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1401 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1402 } 1702 }
1403 1703
1404 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1405} 1705}
1406 1706
… …
1422 active_fg => [0, 0, 0], 1722 active_fg => [0, 0, 0],
1423 can_hover => 1, 1723 can_hover => 1,
1424 can_focus => 1, 1724 can_focus => 1,
1425 valign => 0, 1725 valign => 0,
1426 can_events => 1, 1726 can_events => 1,
1727 #text => ...
1728 #hidden => "*",
1427 @_ 1729 @_
1428 ) 1730 )
1429} 1731}
1430 1732
1431sub _set_text { 1733sub _set_text {
… …
1433 1735
1434 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1435 1737
1436 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1437 1739
1438 delete $self->{texture};
1439
1440 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1441 $self->{text} = $text; 1741 $self->{text} = $text;
1442 1742
1443 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1444 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1445 1746
1446 $self->emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1447} 1751}
1448 1752
1449sub set_text { 1753sub set_text {
1450 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1451 1755
1452 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1453 $self->_set_text ($text); 1757 $self->_set_text ($text);
1454 $self->check_size;
1455 $self->update;
1456} 1758}
1457 1759
1458sub get_text { 1760sub get_text {
1459 $_[0]{text} 1761 $_[0]{text}
1460} 1762}
… …
1463 my ($self) = @_; 1765 my ($self) = @_;
1464 1766
1465 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1466 1768
1467 ($w + 1, $h) # add 1 for cursor 1769 ($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} 1770}
1475 1771
1476sub key_down { 1772sub key_down {
1477 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1478 1774
… …
1493 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1494 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1495 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1496 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1497 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1498 $self->emit ('escape'); 1794 $self->_emit ('escape');
1499 } elsif ($uni) { 1795 } elsif ($uni) {
1500 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1501 } 1799 }
1502 1800
1503 $self->_set_text ($text); 1801 $self->_set_text ($text);
1504 $self->update; 1802
1803 $self->realloc;
1804
1805 1
1505} 1806}
1506 1807
1507sub focus_in { 1808sub focus_in {
1508 my ($self) = @_; 1809 my ($self) = @_;
1509 1810
… …
1524 utf8::encode $text; 1825 utf8::encode $text;
1525 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1526 1827
1527 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1528 $self->update; 1829 $self->update;
1830
1831 1
1529} 1832}
1530 1833
1531sub mouse_motion { 1834sub mouse_motion {
1532 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1533# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 0
1534} 1839}
1535 1840
1536sub _draw { 1841sub _draw {
1537 my ($self) = @_; 1842 my ($self) = @_;
1538 1843
1539 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1540 1845
1541 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1542 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1543 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1544 } else { 1849 } else {
1545 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1546 } 1851 }
1547 1852
1548 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1549 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1550 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1551 glVertex 0 , 0; 1856 glVertex 0 , 0;
1552 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1553 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1554 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1589 if ($sym == 13) { 1894 if ($sym == 13) {
1590 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1591 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1592 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1593 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1594 $self->emit (activate => $txt); 1899 $self->_emit (activate => $txt);
1595 $self->update; 1900 $self->update;
1596 1901
1597 } elsif ($sym == CFClient::SDLK_UP) { 1902 } elsif ($sym == CFClient::SDLK_UP) {
1598 if ($self->{history_pointer} < 0) { 1903 if ($self->{history_pointer} < 0) {
1599 $self->{history_saveback} = $self->get_text; 1904 $self->{history_saveback} = $self->get_text;
… …
1615 } else { 1920 } else {
1616 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1617 } 1922 }
1618 1923
1619 } else { 1924 } else {
1620 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1621 } 1928 1
1622
1623} 1929}
1624 1930
1625############################################################################# 1931#############################################################################
1626 1932
1627package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1636 1942
1637sub new { 1943sub new {
1638 my $class = shift; 1944 my $class = shift;
1639 1945
1640 $class->SUPER::new ( 1946 $class->SUPER::new (
1641 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1642 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1643 bg => [1, 1, 1, 0.2],
1644 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1645 can_hover => 1, 1951 can_hover => 1,
1646 align => 0, 1952 align => 0,
1647 valign => 0, 1953 valign => 0,
1648 can_events => 1, 1954 can_events => 1,
1649 @_ 1955 @_
1650 ) 1956 )
1651} 1957}
1652 1958
1959sub activate { }
1960
1653sub button_up { 1961sub button_up {
1654 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1655 1963
1964 $self->emit ("activate")
1656 if ($x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1657 && $y >= 0 && $y < $self->{h}) { 1966 && $y >= 0 && $y < $self->{h};
1658 $self->emit ("activate"); 1967
1659 } 1968 1
1660} 1969}
1661 1970
1662sub _draw { 1971sub _draw {
1663 my ($self) = @_; 1972 my ($self) = @_;
1664 1973
1665 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1666
1667 if ($GRAB == $self) {
1668 $self->{fg} = $self->{active_fg};
1669 }
1670 1975
1671 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1673 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1674 1979
… …
1679 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1680} 1985}
1681 1986
1682############################################################################# 1987#############################################################################
1683 1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
2023}
2024
2025#############################################################################
2026
1684package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1685 2028
1686our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1687 2030
1688my @tex = 2031my @tex =
… …
1693 2036
1694sub new { 2037sub new {
1695 my $class = shift; 2038 my $class = shift;
1696 2039
1697 $class->SUPER::new ( 2040 $class->SUPER::new (
1698 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1699 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1700 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
2045 bg => [0, 0, 0, 0.2],
2046 active_bg => [1, 1, 1, 0.5],
1701 state => 0, 2047 state => 0,
1702 can_hover => 1, 2048 can_hover => 1,
1703 @_ 2049 @_
1704 ) 2050 )
1705} 2051}
1706 2052
1707sub size_request { 2053sub size_request {
1708 my ($self) = @_; 2054 my ($self) = @_;
1709 2055
1710 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1711} 2057}
1712 2058
1713sub button_down { 2059sub button_down {
1714 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1715 2061
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1718 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1720 } 2070 1
1721} 2071}
1722 2072
1723sub _draw { 2073sub _draw {
1724 my ($self) = @_; 2074 my ($self) = @_;
1725 2075
1726 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1727 2077
1728 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1729 2079
1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1731 2083
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 2085
1734 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735 2087
… …
1890 2242
1891 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
1892 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
1893 2245
1894 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
1895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1896 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
1897 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1898 2251
1899 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
1900 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
1989 qw(s1_slider.png s1_slider_bg.png); 2342 qw(s1_slider.png s1_slider_bg.png);
1990 2343
1991sub new { 2344sub new {
1992 my $class = shift; 2345 my $class = shift;
1993 2346
1994 # range [value, low, high, page] 2347 # range [value, low, high, page, unit]
1995 2348
1996 # TODO: 0-width page 2349 # TODO: 0-width page
1997 # TODO: req_w/h are wrong with vertical 2350 # TODO: req_w/h are wrong with vertical
1998 # TODO: calculations are off 2351 # TODO: calculations are off
1999 my $self = $class->SUPER::new ( 2352 my $self = $class->SUPER::new (
2000 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2001 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2355 bg => [0, 0, 0, 0.2],
2356 active_bg => [1, 1, 1, 0.5],
2002 range => [0, 0, 100, 10], 2357 range => [0, 0, 100, 10, 0],
2003 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2004 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2005 vertical => 0, 2360 vertical => 0,
2006 can_hover => 1, 2361 can_hover => 1,
2007 inner_pad => 5, 2362 inner_pad => 0.02,
2008 @_ 2363 @_
2009 ); 2364 );
2010 2365
2366 $self->set_value ($self->{range}[0]);
2367 $self->update;
2368
2011 $self 2369 $self
2012} 2370}
2013 2371
2372sub changed { }
2373
2374sub set_range {
2375 my ($self, $range) = @_;
2376
2377 ($range, $self->{range}) = ($self->{range}, $range);
2378
2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2383}
2384
2385sub set_value {
2386 my ($self, $value) = @_;
2387
2388 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2389
2390 $hi = $lo + 1 if $hi <= $lo;
2391
2392 $page = $hi - $lo if $page > $hi - $lo;
2393
2394 $value = $lo if $value < $lo;
2395 $value = $hi - $page if $value > $hi - $page;
2396
2397 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2398 if $unit;
2399
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401
2402 if ($value != $old_value) {
2403 $self->_emit (changed => $value);
2404 $self->update;
2405 }
2406}
2407
2014sub size_request { 2408sub size_request {
2015 my ($self) = @_; 2409 my ($self) = @_;
2016 2410
2017 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2018 my $h = $self->{req_h};
2019
2020 $self->{vertical} ? ($h, $w) : ($w, $h)
2021} 2412}
2022 2413
2023sub button_down { 2414sub button_down {
2024 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2025 2416
2026 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2418
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420
2027 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2028} 2422}
2029 2423
2030sub mouse_motion { 2424sub mouse_motion {
2031 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2032 2426
2033 if ($GRAB == $self) { 2427 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429
2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2431
2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2433
2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else {
2436 return 0;
2437 }
2438
2439 1
2440}
2441
2442sub update {
2443 my ($self) = @_;
2444
2445 delete $self->{knob_w};
2446 $self->SUPER::update;
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 unless ($self->{knob_w}) {
2453 $self->set_value ($self->{range}[0]);
2454
2034 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2456 my $range = ($hi - $page - $lo) || 1e-100;
2035 2457
2036 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2458 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037 2459
2038 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2460 $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 2461 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040 2462
2041 $x -= $inner_pad_px; # substract the padding 2463 $value = ($value - $lo) / $range;
2042 $x = $x * ($hi - $lo) / $inner_w + $lo; 2464 $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 2465
2047 $self->emit (changed => $x); 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2048 $self->update; 2467 $self->{knob_w} = $knob_w;
2049 } 2468 }
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 2469
2063 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2064 2471
2065 my ($w, $h) = @$self{qw(w h)}; 2472 glScale $self->{w}, $self->{h};
2066 2473
2067 if ($self->{vertical}) { 2474 if ($self->{vertical}) {
2068 # draw a vertical slider like a rotated horizontal slider 2475 # draw a vertical slider like a rotated horizontal slider
2069 2476
2477 glTranslate 1, 0, 0;
2070 glRotate 90, 0, 0, 1; 2478 glRotate 90, 0, 0, 1;
2071 glTranslate 0, -$self->{w}, 0;
2072
2073 ($w, $h) = ($h, $w);
2074 } 2479 }
2075 2480
2076 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2481 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2482 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078 2483
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; 2484 glEnable GL_TEXTURE_2D;
2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099 2486
2100 # draw background 2487 # draw background
2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2488 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102 2489
2103 # draw handle 2490 # draw handle
2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2491 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2105 2492
2106 glDisable GL_TEXTURE_2D; 2493 glDisable GL_TEXTURE_2D;
2107} 2494}
2108 2495
2109############################################################################# 2496#############################################################################
2110 2497
2498package CFClient::UI::ValSlider;
2499
2500our @ISA = CFClient::UI::HBox::;
2501
2502sub new {
2503 my ($class, %arg) = @_;
2504
2505 my $range = delete $arg{range};
2506
2507 my $self = $class->SUPER::new (
2508 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2509 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2510 to_value => sub { shift },
2511 from_value => sub { shift },
2512 %arg,
2513 );
2514
2515 $self->{slider}->connect (changed => sub {
2516 my ($self, $value) = @_;
2517 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2518 $self->{parent}->emit (changed => $value);
2519 });
2520
2521# $self->{entry}->connect (changed => sub {
2522# my ($self, $value) = @_;
2523# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2524# $self->{parent}->emit (changed => $value);
2525# });
2526
2527 $self->add ($self->{slider}, $self->{entry});
2528
2529 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2530
2531 $self
2532}
2533
2534sub set_range { shift->{slider}->set_range (@_) }
2535sub set_value { shift->{slider}->set_value (@_) }
2536
2537#############################################################################
2538
2111package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2112 2540
2113our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2114 2542
2115use CFClient::OpenGL; 2543use CFClient::OpenGL;
2116 2544
… …
2118 my $class = shift; 2546 my $class = shift;
2119 2547
2120 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2121 fontsize => 1, 2549 fontsize => 1,
2122 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2123 #font => default_font 2552 #font => default_font
2124 @_, 2553 @_,
2125 2554
2126 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2127 par => [], 2556 par => [],
… …
2142 2571
2143 $self->{fontsize} = $fontsize; 2572 $self->{fontsize} = $fontsize;
2144 $self->reflow; 2573 $self->reflow;
2145} 2574}
2146 2575
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 { 2576sub size_allocate {
2167 my ($self, $w, $h) = @_; 2577 my ($self, $w, $h) = @_;
2168 2578
2169 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2170 2580
2171 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2172 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2173 $self->{layout}->set_width ($self->{children}[0]{w}); 2583 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2174 2585
2175 $self->reflow; 2586 $self->reflow;
2176} 2587}
2177 2588
2589sub text_size {
2590 my ($self, $text, $indent) = @_;
2591
2592 my $layout = $self->{layout};
2593
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($text);
2598
2599 $layout->size
2600}
2601
2602sub reflow {
2603 my ($self) = @_;
2604
2605 $self->{need_reflow}++;
2606 $self->update;
2607}
2608
2609sub set_offset {
2610 my ($self, $offset) = @_;
2611
2612 # todo: base offset on lines or so, not on pixels
2613 $self->{children}[1]->set_value ($offset);
2614}
2615
2616sub clear {
2617 my ($self) = @_;
2618
2619 $self->{par} = [];
2620 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622}
2623
2178sub add_paragraph { 2624sub add_paragraph {
2179 my ($self, $color, $text) = @_; 2625 my ($self, $color, $text, $indent) = @_;
2180 2626
2181 #TODO: intelligently "reformat" paragraph 2627 for my $line (split /\n/, $text) {
2182 2628 my ($w, $h) = $self->text_size ($line);
2183 my $height = $self->text_height ($text);
2184
2185 $self->{height} += $height; 2629 $self->{height} += $h;
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2631 }
2186 2632
2187 push @{$self->{par}}, [$height, $color, $text];
2188
2189 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2190 $self->{children}[1]->update;
2191} 2634}
2192 2635
2193sub update { 2636sub update {
2194 my ($self) = @_; 2637 my ($self) = @_;
2195 2638
… …
2197 2640
2198 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2199 2642
2200 delete $self->{texture}; 2643 delete $self->{texture};
2201 2644
2202 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647
2203 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2204 my $height = 0; 2649 my $height = 0;
2205 2650
2206 $height += $_->[0] = $self->text_height ($_->[2]) 2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2207 for @{$self->{par}}; 2655 for (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659 $layout->set_markup ($_->[4]);
2660 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3];
2662 $_->[1] = $h;
2663 }
2664
2665 $height += $_->[1];
2666 }
2208 2667
2209 $self->{height} = $height; 2668 $self->{height} = $height;
2210 2669
2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2212 2671
2213 delete $self->{texture}; 2672 delete $self->{texture};
2214 } 2673 }
2215 2674
2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2217 glClearColor 0, 0, 0, 0; 2676 glClearColor 0, 0, 0, 0;
2218 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2219 2678
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]; 2679 my $top = int $self->{children}[1]{range}[0];
2224 2680
2225 my $y0 = $top; 2681 my $y0 = $top;
2226 my $y1 = $top + $self->{h}; 2682 my $y1 = $top + $H;
2227 2683
2228 my $y = 0; 2684 my $y = 0;
2229 2685
2230 my $layout = $self->{layout}; 2686 my $layout = $self->{layout};
2231 2687
2232 $layout->set_font ($self->{font}) if $self->{font}; 2688 $layout->set_font ($self->{font}) if $self->{font};
2233 2689
2690 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693
2234 for my $par (@{$self->{par}}) { 2694 for my $par (@{$self->{par}}) {
2235 my $h = $par->[0]; 2695 my $h = $par->[1];
2236 2696
2237 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] }); 2698 $layout->set_foreground (@{ $par->[2] });
2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2239 $layout->set_markup ($par->[2]); 2701 $layout->set_markup ($par->[4]);
2240 2702
2241 my ($W, $H) = $layout->size; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2704
2705 glRasterPos $par->[3], $y - $y0;
2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2243 } 2707 }
2244 2708
2245 $y += $h; 2709 $y += $h;
2246 } 2710 }
2247 2711
2248 glDisable GL_TEXTURE_2D; 2712 glDisable GL_BLEND;
2249 }; 2713 };
2250 }); 2714 });
2251} 2715}
2252 2716
2253sub _draw { 2717sub _draw {
2254 my ($self) = @_; 2718 my ($self) = @_;
2255 2719
2256 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2260 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2261 2725
2262 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2263 2727
… …
2313 2777
2314sub new { 2778sub new {
2315 my $class = shift; 2779 my $class = shift;
2316 2780
2317 my $self = $class->SUPER::new ( 2781 my $self = $class->SUPER::new (
2318 state => 0, 2782 state => 0,
2319 connect_activate => \&toggle_flopper, 2783 on_activate => \&toggle_flopper,
2320 @_ 2784 @_
2321 ); 2785 );
2322 2786
2323 if ($self->{state}) {
2324 $self->{state} = 0;
2325 $self->toggle_flopper;
2326 }
2327
2328 $self 2787 $self
2329} 2788}
2330 2789
2331sub toggle_flopper { 2790sub toggle_flopper {
2332 my ($self) = @_; 2791 my ($self) = @_;
2333 2792
2334 # TODO: use animation 2793 $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} 2794}
2346 2795
2347############################################################################# 2796#############################################################################
2348 2797
2349package CFClient::UI::Tooltip; 2798package CFClient::UI::Tooltip;
… …
2362} 2811}
2363 2812
2364sub set_tooltip_from { 2813sub set_tooltip_from {
2365 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2366 2815
2816 my $tooltip = $widget->{tooltip};
2817
2818 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2821 . "req $widget->{req_w} $widget->{req_h}\n"
2822 . "visible $widget->{visible}";
2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2827
2367 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2368 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8, 2831 fontsize => 0.8,
2371 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2833 ellipsise => 0,
2372 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 ); 2835 );
2374} 2836}
2375 2837
2376sub size_request { 2838sub size_request {
2377 my ($self) = @_; 2839 my ($self) = @_;
… …
2383 2845
2384sub size_allocate { 2846sub size_allocate {
2385 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2386 2848
2387 $self->SUPER::size_allocate ($w - 4, $h - 4); 2849 $self->SUPER::size_allocate ($w - 4, $h - 4);
2850}
2851
2852sub visibility_change {
2853 my ($self, $visible) = @_;
2854
2855 return unless $visible;
2856
2857 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner}
2859 or return;
2860
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w};
2865
2866 $self->move_abs ($x, $y);
2867 });
2388} 2868}
2389 2869
2390sub _draw { 2870sub _draw {
2391 my ($self) = @_; 2871 my ($self) = @_;
2392 2872
… …
2409 glVertex $w, $h; 2889 glVertex $w, $h;
2410 glVertex $w, 0; 2890 glVertex $w, 0;
2411 glEnd; 2891 glEnd;
2412 2892
2413 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2414 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2415} 2896}
2416 2897
2417############################################################################# 2898#############################################################################
2418 2899
… …
2423use CFClient::OpenGL; 2904use CFClient::OpenGL;
2424 2905
2425sub new { 2906sub new {
2426 my $class = shift; 2907 my $class = shift;
2427 2908
2428 $class->SUPER::new ( 2909 my $self = $class->SUPER::new (
2429 aspect => 1, 2910 aspect => 1,
2911 can_events => 0,
2430 @_, 2912 @_,
2431 ) 2913 );
2914
2915 if ($self->{anim} && $self->{animspeed}) {
2916 Scalar::Util::weaken (my $widget = $self);
2917
2918 $self->{timer} = Event->timer (
2919 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2920 hard => 1,
2921 interval => $self->{animspeed},
2922 cb => sub {
2923 ++$widget->{frame};
2924 $widget->update;
2925 },
2926 );
2927 }
2928
2929 $self
2432} 2930}
2433 2931
2434sub size_request { 2932sub size_request {
2435 (32, 8) 2933 (32, 8)
2436} 2934}
2437 2935
2936sub update {
2937 my ($self) = @_;
2938
2939 return unless $self->{visible};
2940
2941 $self->SUPER::update;
2942}
2943
2438sub _draw { 2944sub _draw {
2439 my ($self) = @_; 2945 my ($self) = @_;
2440 2946
2441 return unless $::CONN;#d# manage and cache textures differently 2947 return unless $::CONN;
2948
2949 my $face;
2950
2951 if ($self->{frame}) {
2952 my $anim = $::CONN->{anim}[$self->{anim}];
2953
2954 $face = $anim->[ $self->{frame} % @$anim ]
2955 if $anim && @$anim;
2956 }
2957
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443 2959
2444 # TODO animation
2445 if ($tex) { 2960 if ($tex) {
2446 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2451 } 2966 }
2452} 2967}
2453 2968
2969sub destroy {
2970 my ($self) = @_;
2971
2972 $self->{timer}->cancel
2973 if $self->{timer};
2974
2975 $self->SUPER::destroy;
2976}
2977
2454############################################################################# 2978#############################################################################
2455 2979
2456package CFClient::UI::InventoryItem; 2980package CFClient::UI::Buttonbar;
2457 2981
2458our @ISA = CFClient::UI::HBox::; 2982our @ISA = CFClient::UI::HBox::;
2459 2983
2460sub new { 2984# 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 { $a->{type} <=> $b->{type} } @$items;
2544
2545 $self->{real_items} = \@items;
2546
2547 for my $item (@items) {
2548 my $desc = $item->{nrof} < 2
2549 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}";
2551
2552 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2553 }
2554
2555# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2556}
2557
2558sub size_request {
2559 my ($self) = @_;
2560 ($self->{req_w}, $self->{req_h});
2561}
2562 2985
2563############################################################################# 2986#############################################################################
2564 2987
2565package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2566 2989
… …
2578 ); 3001 );
2579 3002
2580 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2581 3004
2582 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2583 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2584 3007
2585 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2586 if (!ref $widget) { 3009 if (!ref $widget) {
2587 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2588 can_hover => 1, 3011 can_hover => 1,
2589 can_events => 1, 3012 can_events => 1,
2590 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2591 } 3015 }
2592 3016
2593 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2594 3018
2595 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2600 3024
2601# popup given the event (must be a mouse button down event currently) 3025# popup given the event (must be a mouse button down event currently)
2602sub popup { 3026sub popup {
2603 my ($self, $ev) = @_; 3027 my ($self, $ev) = @_;
2604 3028
2605 $self->emit ("popdown"); 3029 $self->_emit ("popdown");
2606 3030
2607 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2608 $GRAB = $self; 3032 $GRAB = $self;
2609 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2610 3034
2611 $self->show; 3035 $self->show;
2612 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2613} 3037}
2614 3038
2615sub mouse_motion { 3039sub mouse_motion {
2616 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2617 3041
2618 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2619 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2620 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2621} 3047}
2622 3048
2623sub button_up { 3049sub button_up {
2624 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2625 3051
2626 if ($ev->{button} == $self->{button}) { 3052 if ($ev->{button} == $self->{button}) {
2627 undef $GRAB; 3053 undef $GRAB;
2628 $self->hide; 3054 $self->hide;
2629 3055
2630 $self->emit ("popdown"); 3056 $self->_emit ("popdown");
2631 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2632 } 3062 1
2633} 3063}
2634 3064
2635############################################################################# 3065#############################################################################
2636 3066
3067package CFClient::UI::Multiplexer;
3068
3069our @ISA = CFClient::UI::Container::;
3070
3071sub new {
3072 my $class = shift;
3073
3074 my $self = $class->SUPER::new (
3075 @_,
3076 );
3077
3078 $self->{current} = $self->{children}[0]
3079 if @{ $self->{children} };
3080
3081 $self
3082}
3083
3084sub add {
3085 my ($self, @widgets) = @_;
3086
3087 $self->SUPER::add (@widgets);
3088
3089 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} };
3091}
3092
3093sub set_current_page {
3094 my ($self, $page_or_widget) = @_;
3095
3096 my $widget = ref $page_or_widget
3097 ? $page_or_widget
3098 : $self->{children}[$page_or_widget];
3099
3100 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102
3103 $self->_emit (page_changed => $self->{current});
3104
3105 $self->realloc;
3106}
3107
3108sub visible_children {
3109 $_[0]{current}
3110}
3111
3112sub size_request {
3113 my ($self) = @_;
3114
3115 $self->{current}->size_request
3116}
3117
3118sub size_allocate {
3119 my ($self, $w, $h) = @_;
3120
3121 $self->{current}->configure (0, 0, $w, $h);
3122}
3123
3124sub _draw {
3125 my ($self) = @_;
3126
3127 $self->{current}->draw;
3128}
3129
3130#############################################################################
3131
3132package CFClient::UI::Notebook;
3133
3134our @ISA = CFClient::UI::VBox::;
3135
3136sub new {
3137 my $class = shift;
3138
3139 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self
3143 @_,
3144 );
3145
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148
3149 $self
3150}
3151
3152sub add {
3153 my ($self, $title, $widget, $tooltip) = @_;
3154
3155 Scalar::Util::weaken $self;
3156
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget);
3164}
3165
3166sub set_current_page {
3167 my ($self, $page) = @_;
3168
3169 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Combobox;
3176
3177use utf8;
3178
3179our @ISA = CFClient::UI::Button::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 options => [], # [value, title, longdesc], ...
3186 value => undef,
3187 @_,
3188 );
3189
3190 $self->_set_value ($self->{value});
3191
3192 $self
3193}
3194
3195sub button_down {
3196 my ($self, $ev) = @_;
3197
3198 my @menu_items;
3199
3200 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_;
3202
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 }
3205
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207}
3208
3209sub _set_value {
3210 my ($self, $value) = @_;
3211
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3213 or return;
3214
3215 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]);
3218}
3219
3220sub set_value {
3221 my ($self, $value) = @_;
3222
3223 return unless $self->{value} ne $value;
3224
3225 $self->_set_value ($value);
3226 $self->_emit (changed => $value);
3227}
3228
3229#############################################################################
3230
2637package CFClient::UI::Statusbox; 3231package CFClient::UI::Statusbox;
2638 3232
2639our @ISA = CFClient::UI::VBox::; 3233our @ISA = CFClient::UI::VBox::;
2640 3234
3235sub new {
3236 my $class = shift;
3237
3238 my $self = $class->SUPER::new (
3239 fontsize => 0.8,
3240 @_,
3241 );
3242
3243 Scalar::Util::weaken (my $this = $self);
3244
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246
3247 $self
3248}
3249
2641sub reorder { 3250sub reorder {
2642 my ($self) = @_; 3251 my ($self) = @_;
2643 my $NOW = time; 3252 my $NOW = Time::HiRes::time;
3253
3254 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} };
2644 3258
2645 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2646 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2647 } 3261 }
2648 3262
… …
2651 my @items = sort { 3265 my @items = sort {
2652 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2653 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2654 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2655 3269
3270 $self->{timer}->interval (1);
3271
2656 my $count = 10 + 1; 3272 my $count = 10 + 1;
2657 for my $item (@items) { 3273 for my $item (@items) {
2658 last unless --$count; 3274 last unless --$count;
2659 3275
2660 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2661 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2662 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2663 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2664 : $item->{text}; 3280 : $item->{text};
2665 3281
2666 for ($short) { 3282 for ($short) {
2667 s/^\s+//; 3283 s/^\s+//;
2668 s/\012.*/…/s; 3284 s/\s+/ /g;
2669 my $len = int 40 / $item->{fontsize};
2670 substr $_, $len, length, "…" if $len < length;
2671 } 3285 }
2672 3286
2673 new CFClient::UI::Label 3287 new CFClient::UI::Label
2674 markup => $short, 3288 markup => $short,
2675 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2676 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2677 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2678 fontsize => $item->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2679 color => $item->{color}, 3293 max_w => $::WIDTH * 0.44,
3294 fg => [@{ $item->{fg} }],
2680 can_events => 1, 3295 can_events => 1,
2681 can_hover => 1 3296 can_hover => 1
2682 }; 3297 };
3298
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1;
3304 $self->{timer}->interval (1/30);
3305 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 }
3308
3309 push @widgets, $label;
2683 } 3310 }
2684 3311
2685 $self->clear; 3312 $self->clear;
2686 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2687} 3314}
… …
2690 my ($self, $text, %arg) = @_; 3317 my ($self, $text, %arg) = @_;
2691 3318
2692 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2693 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2694 3321
3322 return unless $text;
3323
2695 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2696 3325
2697 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2698 3327
2699 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2700 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2701 $item->{count}++; 3330 $item->{count}++;
2702 } else { 3331 } else {
2703 $item->{count} = 1; 3332 $item->{count} = 1;
2704 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2705 } 3334 }
2706 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2707 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2708 delete $item->{label}; 3337 delete $item->{label};
2709 } else { 3338 } else {
2710 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2711 id => ++$self->{id}, 3340 id => ++$self->{id},
2712 text => $text, 3341 text => $text,
2713 timeout => $timeout, 3342 timeout => $timeout,
2714 tooltip => $text, 3343 tooltip => $text,
2715 fontsize => 0.8,
2716 color => [0.8, 0.8, 0.8, 0.8], 3344 fg => [0.8, 0.8, 0.8, 0.8],
2717 pri => 0, 3345 pri => 0,
2718 count => 1, 3346 count => 1,
2719 %arg, 3347 %arg,
2720 }; 3348 };
2721 } 3349 }
2722 3350
2723 $self->reorder; 3351 $self->reorder;
2724} 3352}
2725 3353
3354sub reconfigure {
3355 my ($self) = @_;
3356
3357 delete $_->{label}
3358 for values %{ $self->{item} || {} };
3359
3360 $self->reorder;
3361 $self->SUPER::reconfigure;
3362}
3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2726############################################################################# 3372#############################################################################
2727 3373
2728package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
2729 3375
2730our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
2731
2732use CFClient::OpenGL;
2733 3377
2734sub new { 3378sub new {
2735 my $class = shift; 3379 my $class = shift;
2736 3380
2737 $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit, $end_cb) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 }
3610}
3611
3612#############################################################################
3613
3614package CFClient::UI::SpellList;
3615
3616our @ISA = CFClient::UI::Table::;
3617
3618sub new {
3619 my $class = shift;
3620
3621 my $self = $class->SUPER::new (
3622 binding => [],
3623 commands => [],
2738 @_, 3624 @_,
2739 ) 3625 )
2740} 3626}
2741 3627
2742sub configure { 3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2743 my ($self, $x, $y, $w, $h) = @_;
2744 3629
2745 $self->{w} = $w; 3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2746 $self->{h} = $h; 3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2747} 3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2748 3640
2749sub check_size { 3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3713sub add_spell {
2750 my ($self) = @_; 3714 my ($self, $spell) = @_;
2751 3715
2752 $self->size_allocate ($self->{w}, $self->{h}) 3716 $self->{spell}->{$spell->{name}} = $spell;
2753 if $self->{w}; 3717 $self->rebuild_spell_list;
3718}
3719
3720sub remove_spell {
3721 my ($self, $spell) = @_;
3722
3723 delete $self->{spell}->{$spell->{name}};
3724 $self->rebuild_spell_list;
3725}
3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3731 $self->rebuild_spell_list;
3732}
3733
3734#############################################################################
3735
3736package CFClient::UI::Root;
3737
3738our @ISA = CFClient::UI::Container::;
3739
3740use List::Util qw(min max);
3741
3742use CFClient::OpenGL;
3743
3744sub new {
3745 my $class = shift;
3746
3747 my $self = $class->SUPER::new (
3748 visible => 1,
3749 @_,
3750 );
3751
3752 Scalar::Util::weaken ($self->{root} = $self);
3753
3754 $self
2754} 3755}
2755 3756
2756sub size_request { 3757sub size_request {
2757 my ($self) = @_; 3758 my ($self) = @_;
2758 3759
2759 ($self->{w}, $self->{h}) 3760 ($self->{w}, $self->{h})
3761}
3762
3763sub _to_pixel {
3764 my ($coord, $size, $max) = @_;
3765
3766 $coord =
3767 $coord eq "center" ? ($max - $size) * 0.5
3768 : $coord eq "max" ? $max
3769 : $coord;
3770
3771 $coord = 0 if $coord < 0;
3772 $coord = $max - $size if $coord > $max - $size;
3773
3774 int $coord + 0.5
2760} 3775}
2761 3776
2762sub size_allocate { 3777sub size_allocate {
2763 my ($self, $w, $h) = @_; 3778 my ($self, $w, $h) = @_;
2764 3779
2765 my $old_w = $self->{old_w};
2766 my $old_h = $self->{old_h};
2767
2768 if ($old_w && $old_h) {
2769 for my $child ($self->children) {
2770 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2771 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2772 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2773 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2774 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2775 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2776 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2777 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2778 }
2779 }
2780
2781 for my $child ($self->children) { 3780 for my $child ($self->children) {
2782 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2783 3782
2784 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3783 $X = $child->{force_x} if exists $child->{force_x};
2785 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3784 $Y = $child->{force_y} if exists $child->{force_y};
3785
3786 $X = _to_pixel $X, $W, $self->{w};
3787 $Y = _to_pixel $Y, $H, $self->{h};
3788
2786 $child->configure ($X, $Y, $W, $H); 3789 $child->configure ($X, $Y, $W, $H);
2787 } 3790 }
2788
2789 $self->{old_w} = $w;
2790 $self->{old_h} = $h;
2791} 3791}
2792 3792
2793sub coord2local { 3793sub coord2local {
2794 my ($self, $x, $y) = @_; 3794 my ($self, $x, $y) = @_;
2795 3795
… …
2803} 3803}
2804 3804
2805sub update { 3805sub update {
2806 my ($self) = @_; 3806 my ($self) = @_;
2807 3807
2808 $self->check_size;
2809 $::WANT_REFRESH++; 3808 $::WANT_REFRESH++;
2810} 3809}
2811 3810
2812sub add { 3811sub add {
2813 my ($self, $child) = @_; 3812 my ($self, @children) = @_;
2814 3813
2815 # integerise window positions 3814 $_->{is_toplevel} = 1
2816 $child->{x} = int $child->{x}; 3815 for @children;
2817 $child->{y} = int $child->{y};
2818 3816
2819 $self->SUPER::add ($child); 3817 $self->SUPER::add (@children);
3818}
3819
3820sub remove {
3821 my ($self, @children) = @_;
3822
3823 $self->SUPER::remove (@children);
3824
3825 delete $self->{is_toplevel}
3826 for @children;
3827
3828 while (@children) {
3829 my $w = pop @children;
3830 push @children, $w->children;
3831 $w->set_invisible;
3832 }
2820} 3833}
2821 3834
2822sub on_refresh { 3835sub on_refresh {
2823 my ($self, $id, $cb) = @_; 3836 my ($self, $id, $cb) = @_;
2824 3837
… …
2837 while ($self->{refresh_hook}) { 3850 while ($self->{refresh_hook}) {
2838 $_->() 3851 $_->()
2839 for values %{delete $self->{refresh_hook}}; 3852 for values %{delete $self->{refresh_hook}};
2840 } 3853 }
2841 3854
2842 if ($self->{check_size}) { 3855 if ($self->{realloc}) {
2843 my @queue = ([], []); 3856 my %queue;
3857 my @queue;
3858 my $widget;
2844 3859
2845 for (;;) { 3860 outer:
2846 if ($self->{check_size}) { 3861 while () {
2847 # heuristic: check containers last 3862 if (my $realloc = delete $self->{realloc}) {
2848 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3863 for $widget (values %$realloc) {
2849 for values %{delete $self->{check_size}} 3864 $widget->{visible} or next; # do not resize invisible widgets
3865
3866 $queue{$widget+0}++ and next; # duplicates are common
3867
3868 push @{ $queue[$widget->{visible}] }, $widget;
3869 }
2850 } 3870 }
2851 3871
2852 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3872 while () {
3873 @queue or last outer;
2853 3874
2854 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3875 $widget = pop @{ $queue[-1] || [] }
2855 ? @$widget{qw(user_w user_h)} 3876 and last;
2856 : $widget->size_request;
2857
2858 if (delete $widget->{force_alloc}
2859 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2860 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2861 3877
3878 pop @queue;
3879 }
3880
3881 delete $queue{$widget+0};
3882
3883 my ($w, $h) = $widget->size_request;
3884
3885 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3886 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3887
3888 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3889 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3890
3891 $w = $widget->{force_w} if exists $widget->{force_w};
3892 $h = $widget->{force_h} if exists $widget->{force_h};
3893
3894 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3895 || delete $widget->{force_realloc}) {
2862 $widget->{req_w} = $w; 3896 $widget->{req_w} = $w;
2863 $widget->{req_h} = $h; 3897 $widget->{req_h} = $h;
2864 3898
2865 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3899 $self->{size_alloc}{$widget+0} = $widget;
2866 3900
2867 $widget->{parent}->check_size
2868 if $widget->{parent}; 3901 if (my $parent = $widget->{parent}) {
3902 $self->{realloc}{$parent+0} = $parent
3903 unless $queue{$parent+0};
3904
3905 $parent->{force_size_alloc} = 1;
3906 $self->{size_alloc}{$parent+0} = $parent;
3907 }
2869 } 3908 }
3909
3910 delete $self->{realloc}{$widget+0};
2870 } 3911 }
2871 } 3912 }
2872 3913
2873 while ($self->{size_alloc}) { 3914 while (my $size_alloc = delete $self->{size_alloc}) {
2874 for (values %{delete $self->{size_alloc}}) { 3915 my @queue = sort { $b->{visible} <=> $a->{visible} }
2875 my ($widget, $w, $h) = @$_; 3916 values %$size_alloc;
3917
3918 while () {
3919 my $widget = pop @queue || last;
3920
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2876 3922
2877 $w = 0 if $w < 0; 3923 $w = 0 if $w < 0;
2878 $h = 0 if $h < 0; 3924 $h = 0 if $h < 0;
2879 3925
3926 $w = int $w + 0.5;
3927 $h = int $h + 0.5;
3928
3929 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930 $widget->{old_w} = $widget->{w};
3931 $widget->{old_h} = $widget->{h};
3932
2880 $widget->{w} = $w; 3933 $widget->{w} = $w;
2881 $widget->{h} = $h; 3934 $widget->{h} = $h;
2882 $widget->size_allocate ($w, $h); 3935
2883 $widget->emit (size_allocate => $w, $h); 3936 $widget->emit (size_allocate => $w, $h);
3937 }
2884 } 3938 }
2885 } 3939 }
2886 3940
2887 while ($self->{post_alloc_hook}) { 3941 while ($self->{post_alloc_hook}) {
2888 $_->() 3942 $_->()
2889 for values %{delete $self->{post_alloc_hook}}; 3943 for values %{delete $self->{post_alloc_hook}};
2890 } 3944 }
2891 3945
3946
2892 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2893 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2894 glClear GL_COLOR_BUFFER_BIT; 3949 glClear GL_COLOR_BUFFER_BIT;
2895 3950
2896 glMatrixMode GL_PROJECTION; 3951 glMatrixMode GL_PROJECTION;
2897 glLoadIdentity; 3952 glLoadIdentity;
2898 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2899 glMatrixMode GL_MODELVIEW; 3954 glMatrixMode GL_MODELVIEW;
2900 glLoadIdentity; 3955 glLoadIdentity;
2901 3956
3957 {
3958 package CFClient::UI::Base;
3959
3960 ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h});
3962 }
3963
2902 $self->_draw; 3964 $self->_draw;
2903} 3965}
2904 3966
2905############################################################################# 3967#############################################################################
2906 3968
2907package CFClient::UI; 3969package CFClient::UI;
2908 3970
2909$ROOT = new CFClient::UI::Root; 3971$ROOT = new CFClient::UI::Root;
2910$TOOLTIP = new CFClient::UI::Tooltip; 3972$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2911 3973
29121 39741
2913 3975

Diff Legend

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