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

Diff Legend

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