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.203 by root, Sun May 14 21:13:11 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 {
… …
202 return if $self->{parent}; 250 return if $self->{parent};
203 251
204 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
205} 253}
206 254
207sub hide { 255sub set_visible {
208 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};
209 279
210 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
211 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
212 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
213 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
214 if $self->{parent}; 314 if $self->{parent};
215} 315}
216 316
217sub move { 317sub move_abs {
218 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
219 319
220 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
221 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
222 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
223 323
224 $self->update; 324 $self->update;
225} 325}
226 326
227sub set_size { 327sub set_size {
228 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
229 329
230 $self->{user_w} = $w; 330 $self->{force_w} = $w;
231 $self->{user_h} = $h; 331 $self->{force_h} = $h;
232 332
233 $self->check_size; 333 $self->realloc;
234} 334}
235 335
236sub size_request { 336sub size_request {
237 require Carp; 337 require Carp;
238 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
240 340
241sub configure { 341sub configure {
242 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
243 343
244 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
245 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
246 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
247 349
248 # use alignment to adjust x, y 350 # use alignment to adjust x, y
249 351
250 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
251 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
252
253 ($w, $h) = ($w2, $h2);
254 } 354 }
255 355
256 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
257 $self->{x} = $x; 357 $self->{x} = $x;
258 $self->{y} = $y; 358 $self->{y} = $y;
259 $self->update; 359 $self->update;
260 } 360 }
261 361
262 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
263 $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;
264 } 369 }
265} 370}
266 371
267sub size_allocate { 372sub size_allocate {
268 # nothing to be done 373 # nothing to be done
269} 374}
270 375
271sub reconfigure {
272 my ($self) = @_;
273
274 $self->check_size (1);
275 $self->update;
276}
277
278sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
279} 382}
280 383
281sub set_max_size { 384sub set_max_size {
282 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
283 386
284 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
285 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 }
286} 407}
287 408
288# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
289sub coord2local { 410sub coord2local {
290 my ($self, $x, $y) = @_; 411 my ($self, $x, $y) = @_;
… …
305 return if $FOCUS == $self; 426 return if $FOCUS == $self;
306 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
307 428
308 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
309 430
310 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
311 432
312 $focus->update if $focus; 433 $focus->update if $focus;
313 $FOCUS->update; 434 $FOCUS->update;
314} 435}
315 436
… …
318 439
319 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
320 441
321 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
322 443
323 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
324 445
325 $focus->update if $focus; #? 446 $focus->update if $focus; #?
326}
327 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
328sub mouse_motion { } 452sub mouse_motion { 0 }
329sub button_up { } 453sub button_up { 0 }
330sub key_down { } 454sub key_down { 0 }
331sub key_up { } 455sub key_up { 0 }
332 456
333sub button_down { 457sub button_down {
334 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
335 459
336 $self->focus_in; 460 $self->focus_in;
337}
338 461
339sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
340sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
341sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
342sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
343sub 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
344 538
345sub draw { 539sub draw {
346 my ($self) = @_; 540 my ($self) = @_;
347 541
348 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);
349 553
350 glPushMatrix; 554 glPushMatrix;
351 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
352 $self->_draw;
353 glPopMatrix;
354 556
355 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
356 my ($x, $y) = @$self{qw(x y)};
357
358 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
359 glEnable GL_BLEND; 559 glEnable GL_BLEND;
360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
361 glBegin GL_QUADS; 561 glBegin GL_QUADS;
362 glVertex $x , $y;
363 glVertex $x + $self->{w}, $y;
364 glVertex $x + $self->{w}, $y + $self->{h};
365 glVertex $x , $y + $self->{h};
366 glEnd;
367 glDisable GL_BLEND;
368 }
369
370 if ($ENV{PCLIENT_DEBUG}) {
371 glPushMatrix;
372 glColor 1, 1, 0, 1;
373 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374 glBegin GL_LINE_LOOP;
375 glVertex 0 , 0; 562 glVertex 0 , 0;
376 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
377 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
378 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
379 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;
380 glPopMatrix; 580 glPopMatrix;
381 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;
382 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
383} 586}
384 587
385sub _draw { 588sub _draw {
386 my ($self) = @_; 589 my ($self) = @_;
387 590
388 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
389} 592}
390 593
391sub find_widget {
392 my ($self, $x, $y) = @_;
393
394 return () unless $self->{can_events};
395
396 return $self
397 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
398 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
399
400 ()
401}
402
403sub set_parent {
404 my ($self, $parent) = @_;
405
406 Scalar::Util::weaken ($self->{parent} = $parent);
407
408 # TODO: req_w _does_change after ->reconfigure
409 $self->check_size
410 unless exists $self->{req_w};
411}
412
413sub check_size {
414 my ($self, $forced) = @_;
415
416 $self->{force_alloc} = 1 if $forced;
417 $CFClient::UI::ROOT->{check_size}{$self} = $self;
418}
419
420sub update {
421 my ($self) = @_;
422
423 $self->{parent}->update
424 if $self->{parent};
425}
426
427sub connect {
428 my ($self, $signal, $cb) = @_;
429
430 push @{ $self->{signal_cb}{$signal} }, $cb;
431}
432
433sub emit {
434 my ($self, $signal, @args) = @_;
435
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437}
438
439sub DESTROY { 594sub DESTROY {
440 my ($self) = @_; 595 my ($self) = @_;
441 596
442 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
443 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
444} 601}
445 602
446############################################################################# 603#############################################################################
447 604
448package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
456 my $class = shift; 613 my $class = shift;
457 614
458 # range [value, low, high, page] 615 # range [value, low, high, page]
459 616
460 $class->SUPER::new ( 617 $class->SUPER::new (
461 bg => [0, 0, 0, 0.2], 618 #bg => [0, 0, 0, 0.2],
462 active_bg => [1, 1, 1, 0.5], 619 #active_bg => [1, 1, 1, 0.5],
463 @_ 620 @_
464 ) 621 )
465} 622}
466 623
467sub _draw { 624sub _draw {
468 my ($self) = @_; 625 my ($self) = @_;
469 626
627 my $color = $FOCUS == $self && $self->{active_bg}
628 ? $self->{active_bg}
629 : $self->{bg};
630
631 if ($color && (@$color < 4 || $color->[3])) {
470 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
471 633
472 glEnable GL_BLEND; 634 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
474 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 636 glColor_premultiply @$color;
475 637
476 glBegin GL_QUADS; 638 glBegin GL_QUADS;
477 glVertex 0 , 0; 639 glVertex 0 , 0;
478 glVertex 0 , $h; 640 glVertex 0 , $h;
479 glVertex $w, $h; 641 glVertex $w, $h;
480 glVertex $w, 0; 642 glVertex $w, 0;
481 glEnd; 643 glEnd;
482 644
483 glDisable GL_BLEND; 645 glDisable GL_BLEND;
646 }
484} 647}
485 648
486############################################################################# 649#############################################################################
487 650
488package CFClient::UI::Empty; 651package CFClient::UI::Empty;
… …
493 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
494 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
495} 658}
496 659
497sub size_request { 660sub size_request {
498 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
499} 664}
500 665
501sub draw { } 666sub draw { }
502 667
503############################################################################# 668#############################################################################
… …
507our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
508 673
509sub new { 674sub new {
510 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
511 676
512 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
513 678
514 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
515 children => [], 680 children => [],
516 can_events => 0, 681 can_events => 0,
517 %arg, 682 %arg,
518 ); 683 );
684
519 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
520 687
521 $self 688 $self
522} 689}
523 690
524sub add { 691sub add {
… …
532 $self->{children} = [ 699 $self->{children} = [
533 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
534 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
535 ]; 702 ];
536 703
537 $self->check_size (1); 704 $self->realloc;
538 $self->update;
539} 705}
540 706
541sub children { 707sub children {
542 @{ $_[0]{children} } 708 @{ $_[0]{children} }
543} 709}
… …
548 delete $child->{parent}; 714 delete $child->{parent};
549 $child->hide; 715 $child->hide;
550 716
551 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552 718
553 $self->check_size; 719 $self->realloc;
554 $self->update;
555} 720}
556 721
557sub clear { 722sub clear {
558 my ($self) = @_; 723 my ($self) = @_;
559 724
… …
563 for (@$children) { 728 for (@$children) {
564 delete $_->{parent}; 729 delete $_->{parent};
565 $_->hide; 730 $_->hide;
566 } 731 }
567 732
568 $self->check_size; 733 $self->realloc;
569 $self->update;
570} 734}
571 735
572sub find_widget { 736sub find_widget {
573 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
574 738
575 $x -= $self->{x}; 739 $x -= $self->{x};
576 $y -= $self->{y}; 740 $y -= $self->{y};
577 741
578 my $res; 742 my $res;
579 743
580 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
581 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
582 and return $res; 746 and return $res;
583 } 747 }
584 748
585 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
606} 770}
607 771
608sub add { 772sub add {
609 my ($self, $child) = @_; 773 my ($self, $child) = @_;
610 774
611 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
612
613 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
614} 777}
615 778
616sub remove { 779sub remove {
617 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
634 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
635} 798}
636 799
637############################################################################# 800#############################################################################
638 801
802# back-buffered drawing area
803
639package CFClient::UI::Window; 804package CFClient::UI::Window;
640 805
641our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
642 807
643use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
661 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
662 $self->update; 827 $self->update;
663} 828}
664 829
665sub _render { 830sub _render {
831 my ($self) = @_;
832
666 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
667} 834}
668 835
669sub render_child { 836sub render_child {
670 my ($self) = @_; 837 my ($self) = @_;
671 838
672 $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 {
673 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
674 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
675 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
676 $self->_render; 850 $self->_render;
677# glColorMask 1, 1, 1, 0;
678# glEnable GL_BLEND;
679# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680# glRasterPos 0, 0;
681# glCopyPixels 0, 0, $self->{w}, $self->{h};
682# glDisable GL_BLEND;
683# glColorMask 1, 1, 1, 1;
684 }; 851 };
685} 852}
686 853
687sub _draw { 854sub _draw {
688 my ($self) = @_; 855 my ($self) = @_;
689 856
690 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
691 858
692 my $tex = $self->{texture} 859 my $tex = $self->{texture}
693 or return; 860 or return;
694 861
695 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
… …
705 872
706package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
707 874
708our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
709 876
877sub new {
878 my $class = shift;
879
880 $class->SUPER::new (
881 scroll_x => 0,
882 scroll_y => 1,
883 @_,
884 )
885}
886
710sub size_request { 887sub size_request {
711 my ($self) = @_; 888 my ($self) = @_;
712 889
713 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
714 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
715 891
716 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
717} 896}
718 897
719sub size_allocate { 898sub size_allocate {
720 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
721 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);
722 $self->update; 907 $self->update;
723} 908}
724 909
725sub set_offset { 910sub set_offset {
726 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
… …
760} 945}
761 946
762sub _render { 947sub _render {
763 my ($self) = @_; 948 my ($self) = @_;
764 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
765 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
766 954
767 $self->SUPER::_render; 955 $self->SUPER::_render;
768} 956}
769 957
… …
772package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
773 961
774our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
775 963
776sub new { 964sub new {
777 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
778 968
779 my $self; 969 my $self;
780 970
781 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
782 vertical => 1, 972 vertical => 1,
783 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
784 connect_changed => sub { 974 on_changed => sub {
785 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 975 $self->{vp}->set_offset (0, $_[1]);
786 }, 976 },
787 ; 977 ;
788 978
789 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
790 vp => (new CFClient::UI::ViewPort), 980 vp => (new CFClient::UI::ViewPort expand => 1),
791 slider => $slider, 981 slider => $slider,
792 @_, 982 %arg,
793 ); 983 );
794 984
795 $self->{vp}->add ($self->{scrolled});
796 $self->add ($self->{vp});
797 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
798 987
799 $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]);
800} 1014}
801 1015
802#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
803# update viewport offset on scroll 1017# update viewport offset on scroll
804 1018
… …
824 1038
825 if ($self->{bg}) { 1039 if ($self->{bg}) {
826 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
827 1041
828 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
829 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
830 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
831 1045
832 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
833 glVertex 0 , 0; 1047 glVertex 0 , 0;
834 glVertex 0 , $h; 1048 glVertex 0 , $h;
835 glVertex $w, $h; 1049 glVertex $w, $h;
… …
848 1062
849our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
850 1064
851use CFClient::OpenGL; 1065use CFClient::OpenGL;
852 1066
853my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
854 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
855 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);
856 1074
857sub new { 1075sub new {
858 my $class = shift; 1076 my ($class, %arg) = @_;
859
860 # TODO: user_x, user_y, overwrite moveto?
861 1077
862 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
863 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
864 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
865 border => 0.6, 1081 border => 0.6,
866 toplevel => 1,
867 can_events => 1, 1082 can_events => 1,
868 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
869 ); 1086 );
870 1087
871 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
872 align => 0, 1089 align => 0,
873 valign => 1, 1090 valign => 1,
874 text => $self->{title}, 1091 text => $self->{title},
875 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
876 1094
877 $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};
878} 1103}
879 1104
880sub border { 1105sub border {
881 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
882} 1107}
883 1108
884sub size_request { 1109sub size_request {
885 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
886 1114
887 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
888 1116
889 ( 1117 (
890 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
893} 1121}
894 1122
895sub size_allocate { 1123sub size_allocate {
896 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
897 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
898 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
899 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
900 1136
901 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
902 if $self->{title};
903
904 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
905} 1138}
906 1139
907sub button_down { 1140sub button_down {
908 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
909 1142
… …
925 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
926 1159
927 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
928 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
929 1162
930 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
931 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
932 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
933 $self->check_size; 1167 $self->realloc;
934 }; 1168 };
935 1169
936 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
937 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
938 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
940 $self->{motion} = sub { 1174 $self->{motion} = sub {
941 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
942 1176
943 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
944 1178
945 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
946 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
947 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
948 } 1187 1
949} 1188}
950 1189
951sub button_up { 1190sub button_up {
952 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
953 1192
954 delete $self->{motion}; 1193 !!delete $self->{motion}
955} 1194}
956 1195
957sub mouse_motion { 1196sub mouse_motion {
958 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
959 1198
960 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
961} 1202}
962 1203
963sub _draw { 1204sub _draw {
964 my ($self) = @_; 1205 my ($self) = @_;
965 1206
1207 my $child = $self->{children}[0];
1208
966 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
967 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
968 1211
969 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
971 1214
972 my $border = $self->border; 1215 my $border = $self->border;
973 1216
974 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
975 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
976 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
977 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
978 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
979 1222
980 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
981 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
982 1225
983 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
984 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
985 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
986
987 glColor @{ $self->{bg} };
988
989 $bg->{s} = $rep_x;
990 $bg->{t} = $rep_y;
991 $bg->{wrap_mode} = 1;
992 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
993 } 1231 }
994 1232
995 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
996 1234
997 $self->{title}->draw if $self->{title};
998
999 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1000} 1241}
1001 1242
1002############################################################################# 1243#############################################################################
1003 1244
1004package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1012sub new { 1253sub new {
1013 my $class = shift; 1254 my $class = shift;
1014 1255
1015 $class->SUPER::new ( 1256 $class->SUPER::new (
1016 col_expand => [], 1257 col_expand => [],
1017 @_ 1258 @_,
1018 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019} 1264}
1020 1265
1021sub add { 1266sub add {
1022 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1023 1268
1024 $child->set_parent ($self); 1269 $child->set_parent ($self);
1025 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1026 1271
1027 $child->check_size; 1272 $self->realloc;
1028} 1273}
1029 1274
1030sub children { 1275sub remove {
1031 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1276 my ($self, $child) = @_;
1032}
1033 1277
1278 # TODO: not yet implemented
1279}
1280
1034# 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?
1035sub clear { 1282sub clear {
1036 my ($self) = @_; 1283 my ($self) = @_;
1037 1284
1038 my @children = $self->children; 1285 my @children = $self->children;
1039 delete $self->{children}; 1286 delete $self->{children};
… …
1041 for (@children) { 1288 for (@children) {
1042 delete $_->{parent}; 1289 delete $_->{parent};
1043 $_->hide; 1290 $_->hide;
1044 } 1291 }
1045 1292
1046 $self->update; 1293 $self->realloc;
1047} 1294}
1048 1295
1049sub get_wh { 1296sub get_wh {
1050 my ($self) = @_; 1297 my ($self) = @_;
1051 1298
… …
1082sub size_allocate { 1329sub size_allocate {
1083 my ($self, $w, $h) = @_; 1330 my ($self, $w, $h) = @_;
1084 1331
1085 my ($ws, $hs) = $self->get_wh; 1332 my ($ws, $hs) = $self->get_wh;
1086 1333
1087 my $req_w = sum @$ws; 1334 my $req_w = (sum @$ws) || 1;
1088 my $req_h = sum @$hs; 1335 my $req_h = (sum @$hs) || 1;
1089 1336
1090 # TODO: nicer code && do row_expand 1337 # TODO: nicer code && do row_expand
1091 my @col_expand = @{$self->{col_expand}}; 1338 my @col_expand = @{$self->{col_expand}};
1092 @col_expand = (1) x @$ws unless @col_expand; 1339 @col_expand = (1) x @$ws unless @col_expand;
1093 my $col_expand = (sum @col_expand) || 1; 1340 my $col_expand = (sum @col_expand) || 1;
… …
1147 } 1394 }
1148} 1395}
1149 1396
1150############################################################################# 1397#############################################################################
1151 1398
1152package CFClient::UI::HBox; 1399package CFClient::UI::Box;
1153
1154# TODO: wrap into common Box base class
1155 1400
1156our @ISA = CFClient::UI::Container::; 1401our @ISA = CFClient::UI::Container::;
1157 1402
1158sub size_request { 1403sub size_request {
1159 my ($self) = @_; 1404 my ($self) = @_;
1160 1405
1161 my @alloc = map [$_->size_request], @{$self->{children}}; 1406 $self->{vertical}
1162 1407 ? (
1163 ( 1408 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1164 (List::Util::sum map $_->[0], @alloc), 1409 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1165 (List::Util::max map $_->[1], @alloc), 1410 )
1166 ) 1411 : (
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 )
1167} 1415}
1168 1416
1169sub size_allocate { 1417sub size_allocate {
1170 my ($self, $w, $h) = @_; 1418 my ($self, $w, $h) = @_;
1171 1419
1172 ($h, $w) = ($w, $h); 1420 my $space = $self->{vertical} ? $h : $w;
1173
1174 my $children = $self->{children}; 1421 my $children = $self->{children};
1175 1422
1176 my @h = map $_->{req_w}, @$children; 1423 my @req;
1177 1424
1178 my $req_h = List::Util::sum @h; 1425 if ($self->{homogeneous}) {
1179 1426 @req = ($space / (@$children || 1)) x @$children;
1180 if ($req_h > $h) {
1181 # ah well, not enough space
1182 $_ *= $h / $req_h for @h;
1183 } 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 {
1184 my $exp = List::Util::sum map $_->{expand}, @$children; 1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1185 $exp ||= 1;
1186 1436
1437 $space = ($space - $req) / $expand; # remaining space to give away
1438
1439 $req[$_] += $space * $children->[$_]{expand}
1187 for (0 .. $#$children) { 1440 for 0 .. $#$children;
1188 my $child = $children->[$_];
1189
1190 my $alloc_h = $h[$_];
1191 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1192 $h[$_] = $alloc_h;
1193 } 1441 }
1194 } 1442 }
1195 1443
1196 CFClient::UI::harmonize \@h; 1444 CFClient::UI::harmonize \@req;
1197 1445
1198 my $y = 0; 1446 my $pos = 0;
1199 for (0 .. $#$children) { 1447 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201 my $h = $h[$_]; 1448 my $alloc = $req[$_];
1202 $child->configure ($y, 0, $h, $w); 1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1203 1450
1204 $y += $h; 1451 $pos += $alloc;
1205 } 1452 }
1206 1453
1207 1 1454 1
1208} 1455}
1209 1456
1210############################################################################# 1457#############################################################################
1211 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
1212package CFClient::UI::VBox; 1474package CFClient::UI::VBox;
1213 1475
1214# TODO: wrap into common Box base class
1215
1216our @ISA = CFClient::UI::Container::; 1476our @ISA = CFClient::UI::Box::;
1217 1477
1218sub size_request { 1478sub new {
1219 my ($self) = @_; 1479 my $class = shift;
1220 1480
1221 my @alloc = map [$_->size_request], @{$self->{children}}; 1481 $class->SUPER::new (
1222 1482 vertical => 1,
1223 ( 1483 @_,
1224 (List::Util::max map $_->[0], @alloc),
1225 (List::Util::sum map $_->[1], @alloc),
1226 ) 1484 )
1227} 1485}
1228 1486
1229sub size_allocate {
1230 my ($self, $w, $h) = @_;
1231
1232 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1234 my $children = $self->{children};
1235
1236 my @h = map $_->{req_h}, @$children;
1237
1238 my $req_h = List::Util::sum @h;
1239
1240 if ($req_h > $h) {
1241 # ah well, not enough space
1242 $_ *= $h / $req_h for @h;
1243 } else {
1244 my $exp = List::Util::sum map $_->{expand}, @$children;
1245 $exp ||= 1;
1246
1247 for (0 .. $#$children) {
1248 my $child = $children->[$_];
1249
1250 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1251 }
1252 }
1253
1254 CFClient::UI::harmonize \@h;
1255
1256 my $y = 0;
1257 for (0 .. $#$children) {
1258 my $child = $children->[$_];
1259 my $h = $h[$_];
1260 $child->configure (0, $y, $w, $h);
1261
1262 $y += $h;
1263 }
1264
1265 1
1266}
1267
1268############################################################################# 1487#############################################################################
1269 1488
1270package CFClient::UI::Label; 1489package CFClient::UI::Label;
1271 1490
1272our @ISA = CFClient::UI::Base::; 1491our @ISA = CFClient::UI::DrawBG::;
1273 1492
1274use CFClient::OpenGL; 1493use CFClient::OpenGL;
1275 1494
1276sub new { 1495sub new {
1277 my ($class, %arg) = @_; 1496 my ($class, %arg) = @_;
1278 1497
1279 my $self = $class->SUPER::new ( 1498 my $self = $class->SUPER::new (
1280 fg => [1, 1, 1], 1499 fg => [1, 1, 1],
1500 #bg => none
1501 #active_bg => none
1281 #font => default_font 1502 #font => default_font
1282 #text => initial text 1503 #text => initial text
1283 #markup => initial narkup 1504 #markup => initial narkup
1505 #max_w => maximum pixel width
1506 ellipsise => 3, # end
1284 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1285 fontsize => 1, 1508 fontsize => 1,
1286 align => -1, 1509 align => -1,
1287 valign => -1, 1510 valign => -1,
1288 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1289 can_events => 0, 1513 can_events => 0,
1290 %arg 1514 %arg
1291 ); 1515 );
1292 1516
1293 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1303 } 1527 }
1304 1528
1305 $self 1529 $self
1306} 1530}
1307 1531
1308sub escape { 1532sub escape($) {
1309 local $_ = $_[1]; 1533 local $_ = $_[0];
1310 1534
1311 s/&/&amp;/g; 1535 s/&/&amp;/g;
1312 s/>/&gt;/g; 1536 s/>/&gt;/g;
1313 s/</&lt;/g; 1537 s/</&lt;/g;
1314 1538
1315 $_[1] 1539 $_
1316} 1540}
1317 1541
1318sub update { 1542sub update {
1319 my ($self) = @_; 1543 my ($self) = @_;
1320 1544
1321 delete $self->{texture}; 1545 delete $self->{texture};
1322 $self->SUPER::update; 1546 $self->SUPER::update;
1323} 1547}
1324 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1325sub set_text { 1556sub set_text {
1326 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1327 1558
1328 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1329 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1330 1561
1331 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1332 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1333 1564
1565 delete $self->{size_req};
1566 $self->realloc;
1334 $self->update; 1567 $self->update;
1335 $self->check_size;
1336} 1568}
1337 1569
1338sub set_markup { 1570sub set_markup {
1339 my ($self, $markup) = @_; 1571 my ($self, $markup) = @_;
1340 1572
… …
1344 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345 1577
1346 $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;
1347 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1348 1580
1581 delete $self->{size_req};
1582 $self->realloc;
1349 $self->update; 1583 $self->update;
1350 $self->check_size;
1351} 1584}
1352 1585
1353sub size_request { 1586sub size_request {
1354 my ($self) = @_; 1587 my ($self) = @_;
1355 1588
1589 $self->{size_req} ||= do {
1356 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1357 $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});
1358 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359 1595
1360 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1361 1597
1362 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1363 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1364 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1365 1601
1366 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1367 1603
1368 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1369 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1370 } 1609 };
1371 1610
1372 ( 1611 @{ $self->{size_req} }
1373 $w + $self->{padding} * 2,
1374 $h + $self->{padding} * 2,
1375 )
1376} 1612}
1377 1613
1378sub size_allocate { 1614sub size_allocate {
1379 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1380 1616
1617 delete $self->{ox};
1618
1381 delete $self->{texture}; 1619 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1382} 1621}
1383 1622
1384sub set_fontsize { 1623sub set_fontsize {
1385 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1386 1625
1387 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1388 delete $self->{texture}; 1627 delete $self->{texture};
1389 1628
1390 $self->update; 1629 $self->realloc;
1391 $self->check_size; 1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1392} 1638}
1393 1639
1394sub _draw { 1640sub _draw {
1395 my ($self) = @_; 1641 my ($self) = @_;
1642
1643 $self->SUPER::_draw; # draw background, if applicable
1396 1644
1397 my $tex = $self->{texture} ||= do { 1645 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}}); 1646 $self->{layout}->set_foreground (@{$self->{fg}});
1399 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1647 $self->{layout}->set_font ($self->{font}) if $self->{font};
1400 $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});
1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1652
1403 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1404
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407 : ($self->{w} - $tex->{w}) * 0.5;
1408
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411 : ($self->{h} - $tex->{h}) * 0.5;
1412
1413 $tex
1414 }; 1654 };
1415 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
1416 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1417 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};
1418 1670
1419 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1420 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1421 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1422 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1423 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1424 } 1678 }
1425 1679
1426 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1427} 1681}
1428 1682
… …
1444 active_fg => [0, 0, 0], 1698 active_fg => [0, 0, 0],
1445 can_hover => 1, 1699 can_hover => 1,
1446 can_focus => 1, 1700 can_focus => 1,
1447 valign => 0, 1701 valign => 0,
1448 can_events => 1, 1702 can_events => 1,
1703 #text => ...
1704 #hidden => "*",
1449 @_ 1705 @_
1450 ) 1706 )
1451} 1707}
1452 1708
1453sub _set_text { 1709sub _set_text {
… …
1455 1711
1456 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1457 1713
1458 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1459 1715
1460 delete $self->{texture};
1461
1462 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1463 $self->{text} = $text; 1717 $self->{text} = $text;
1464 1718
1465 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1466 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1467 1722
1468 $self->emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1469} 1727}
1470 1728
1471sub set_text { 1729sub set_text {
1472 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1473 1731
1474 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1475 $self->_set_text ($text); 1733 $self->_set_text ($text);
1476 $self->check_size;
1477 $self->update;
1478} 1734}
1479 1735
1480sub get_text { 1736sub get_text {
1481 $_[0]{text} 1737 $_[0]{text}
1482} 1738}
… …
1485 my ($self) = @_; 1741 my ($self) = @_;
1486 1742
1487 my ($w, $h) = $self->SUPER::size_request; 1743 my ($w, $h) = $self->SUPER::size_request;
1488 1744
1489 ($w + 1, $h) # add 1 for cursor 1745 ($w + 1, $h) # add 1 for cursor
1490}
1491
1492sub size_allocate {
1493 my ($self, $w, $h) = @_;
1494
1495 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496} 1746}
1497 1747
1498sub key_down { 1748sub key_down {
1499 my ($self, $ev) = @_; 1749 my ($self, $ev) = @_;
1500 1750
… …
1515 } elsif ($sym == CFClient::SDLK_HOME) { 1765 } elsif ($sym == CFClient::SDLK_HOME) {
1516 $self->{cursor} = 0; 1766 $self->{cursor} = 0;
1517 } elsif ($sym == CFClient::SDLK_END) { 1767 } elsif ($sym == CFClient::SDLK_END) {
1518 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1519 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1520 $self->emit ('escape'); 1770 $self->_emit ('escape');
1521 } elsif ($uni) { 1771 } elsif ($uni) {
1522 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1523 } 1775 }
1524 1776
1525 $self->_set_text ($text); 1777 $self->_set_text ($text);
1526 $self->update; 1778
1779 $self->realloc;
1780
1781 1
1527} 1782}
1528 1783
1529sub focus_in { 1784sub focus_in {
1530 my ($self) = @_; 1785 my ($self) = @_;
1531 1786
… …
1546 utf8::encode $text; 1801 utf8::encode $text;
1547 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1548 1803
1549 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1550 $self->update; 1805 $self->update;
1806
1807 1
1551} 1808}
1552 1809
1553sub mouse_motion { 1810sub mouse_motion {
1554 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1555# 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
1556} 1815}
1557 1816
1558sub _draw { 1817sub _draw {
1559 my ($self) = @_; 1818 my ($self) = @_;
1560 1819
1561 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1562 1821
1563 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1564 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1565 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1566 } else { 1825 } else {
1567 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1568 } 1827 }
1569 1828
1570 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1571 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1572 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1573 glVertex 0 , 0; 1832 glVertex 0 , 0;
1574 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1575 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1576 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1611 if ($sym == 13) { 1870 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1871 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1872 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1; 1873 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1874 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1875 $self->_emit (activate => $txt);
1617 $self->update; 1876 $self->update;
1618 1877
1619 } elsif ($sym == CFClient::SDLK_UP) { 1878 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 1879 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 1880 $self->{history_saveback} = $self->get_text;
… …
1637 } else { 1896 } else {
1638 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1639 } 1898 }
1640 1899
1641 } else { 1900 } else {
1642 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1643 } 1904 1
1644
1645} 1905}
1646 1906
1647############################################################################# 1907#############################################################################
1648 1908
1649package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1658 1918
1659sub new { 1919sub new {
1660 my $class = shift; 1920 my $class = shift;
1661 1921
1662 $class->SUPER::new ( 1922 $class->SUPER::new (
1663 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1664 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1667 can_hover => 1, 1927 can_hover => 1,
1668 align => 0, 1928 align => 0,
1669 valign => 0, 1929 valign => 0,
1670 can_events => 1, 1930 can_events => 1,
1671 @_ 1931 @_
1672 ) 1932 )
1673} 1933}
1674 1934
1935sub activate { }
1936
1675sub button_up { 1937sub button_up {
1676 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1677 1939
1940 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1942 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate"); 1943
1681 } 1944 1
1682} 1945}
1683 1946
1684sub _draw { 1947sub _draw {
1685 my ($self) = @_; 1948 my ($self) = @_;
1686 1949
1687 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1688
1689 if ($GRAB == $self) {
1690 $self->{fg} = $self->{active_fg};
1691 }
1692 1951
1693 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1696 1955
… …
1715 1974
1716sub new { 1975sub new {
1717 my $class = shift; 1976 my $class = shift;
1718 1977
1719 $class->SUPER::new ( 1978 $class->SUPER::new (
1720 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1721 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1722 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],
1723 state => 0, 1985 state => 0,
1724 can_hover => 1, 1986 can_hover => 1,
1725 @_ 1987 @_
1726 ) 1988 )
1727} 1989}
1728 1990
1729sub size_request { 1991sub size_request {
1730 my ($self) = @_; 1992 my ($self) = @_;
1731 1993
1732 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1733} 1995}
1734 1996
1735sub button_down { 1997sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1737 1999
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1740 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1742 } 2008 1
1743} 2009}
1744 2010
1745sub _draw { 2011sub _draw {
1746 my ($self) = @_; 2012 my ($self) = @_;
1747 2013
1748 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1749 2015
1750 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1751 2017
1752 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;
1753 2021
1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1755 2023
1756 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757 2025
… …
1912 2180
1913 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
1914 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
1915 2183
1916 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
1917 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;
1918 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
1919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1920 2189
1921 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
1922 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2011 qw(s1_slider.png s1_slider_bg.png); 2280 qw(s1_slider.png s1_slider_bg.png);
2012 2281
2013sub new { 2282sub new {
2014 my $class = shift; 2283 my $class = shift;
2015 2284
2016 # range [value, low, high, page] 2285 # range [value, low, high, page, unit]
2017 2286
2018 # TODO: 0-width page 2287 # TODO: 0-width page
2019 # TODO: req_w/h are wrong with vertical 2288 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2289 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2290 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
2023 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],
2024 range => [0, 0, 100, 10], 2295 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2296 min_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2297 min_h => $::WIDTH / 80,
2027 vertical => 0, 2298 vertical => 0,
2028 can_hover => 1, 2299 can_hover => 1,
2029 inner_pad => 5, 2300 inner_pad => 0.02,
2030 @_ 2301 @_
2031 ); 2302 );
2032 2303
2304 $self->set_value ($self->{range}[0]);
2305 $self->update;
2306
2033 $self 2307 $self
2034} 2308}
2035 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
2036sub size_request { 2346sub size_request {
2037 my ($self) = @_; 2347 my ($self) = @_;
2038 2348
2039 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
2040 my $h = $self->{req_h};
2041
2042 $self->{vertical} ? ($h, $w) : ($w, $h)
2043} 2350}
2044 2351
2045sub button_down { 2352sub button_down {
2046 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2047 2354
2048 $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
2049 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2050} 2360}
2051 2361
2052sub mouse_motion { 2362sub mouse_motion {
2053 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2054 2364
2055 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
2056 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2394 my $range = ($hi - $page - $lo) || 1e-100;
2057 2395
2058 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2396 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059 2397
2060 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2398 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2399 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062 2400
2063 $x -= $inner_pad_px; # substract the padding 2401 $value = ($value - $lo) / $range;
2064 $x = $x * ($hi - $lo) / $inner_w + $lo; 2402 $value = $value * $self->{scale} + $self->{offset};
2065 $x = $lo if $x < $lo;
2066 $x = $hi - $page if $x > $hi - $page;
2067 $self->{range}[0] = $x;
2068 2403
2069 $self->emit (changed => $x); 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2070 $self->update; 2405 $self->{knob_w} = $knob_w;
2071 } 2406 }
2072}
2073
2074# the inner_* stuff is for generating a padding for the slider handle,
2075# so that the handle doesn't leave the texture. This calculation isn't 100%
2076# correct propably, but it does the job for now
2077sub _calc_inner_pad_px {
2078 my ($self, $w) = @_;
2079 ($w / 100) * $self->{inner_pad} # % to pixels
2080}
2081
2082sub _draw {
2083 my ($self) = @_;
2084 2407
2085 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2086 2409
2087 my ($w, $h) = @$self{qw(w h)}; 2410 glScale $self->{w}, $self->{h};
2088 2411
2089 if ($self->{vertical}) { 2412 if ($self->{vertical}) {
2090 # draw a vertical slider like a rotated horizontal slider 2413 # draw a vertical slider like a rotated horizontal slider
2091 2414
2415 glTranslate 1, 0, 0;
2092 glRotate 90, 0, 0, 1; 2416 glRotate 90, 0, 0, 1;
2093 glTranslate 0, -$self->{w}, 0;
2094
2095 ($w, $h) = ($h, $w);
2096 } 2417 }
2097 2418
2098 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2419 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2420 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100 2421
2101 my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103 $hi = $value + 1 if $lo == $hi;
2104
2105 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108 $page = int $page * $inner_w / ($hi - $lo);
2109 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111 $w -= $page;
2112 $page &= ~1;
2113 glTranslate $page * 0.5, 0, 0;
2114 $page ||= 2;
2115
2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119 glEnable GL_TEXTURE_2D; 2422 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2423 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2424
2122 # draw background 2425 # draw background
2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2426 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124 2427
2125 # draw handle 2428 # draw handle
2126 $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);
2127 2430
2128 glDisable GL_TEXTURE_2D; 2431 glDisable GL_TEXTURE_2D;
2129} 2432}
2130 2433
2131############################################################################# 2434#############################################################################
2132 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
2133package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2134 2478
2135our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2136 2480
2137use CFClient::OpenGL; 2481use CFClient::OpenGL;
2138 2482
… …
2140 my $class = shift; 2484 my $class = shift;
2141 2485
2142 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2143 fontsize => 1, 2487 fontsize => 1,
2144 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2145 #font => default_font 2490 #font => default_font
2146 @_, 2491 @_,
2147 2492
2148 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2149 par => [], 2494 par => [],
… …
2164 2509
2165 $self->{fontsize} = $fontsize; 2510 $self->{fontsize} = $fontsize;
2166 $self->reflow; 2511 $self->reflow;
2167} 2512}
2168 2513
2169sub text_height {
2170 my ($self, $text) = @_;
2171
2172 my $layout = $self->{layout};
2173
2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175 $layout->set_width ($self->{children}[0]{w});
2176 $layout->set_markup ($text);
2177
2178 ($layout->size)[1]
2179}
2180
2181sub reflow {
2182 my ($self) = @_;
2183
2184 $self->{need_reflow}++;
2185 $self->update;
2186}
2187
2188sub size_allocate { 2514sub size_allocate {
2189 my ($self, $w, $h) = @_; 2515 my ($self, $w, $h) = @_;
2190 2516
2191 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2192 2518
2193 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2194 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2195 $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});
2196 2523
2197 $self->reflow; 2524 $self->reflow;
2198} 2525}
2199 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
2200sub add_paragraph { 2562sub add_paragraph {
2201 my ($self, $color, $text) = @_; 2563 my ($self, $color, $text, $indent) = @_;
2202 2564
2203 #TODO: intelligently "reformat" paragraph 2565 for my $line (split /\n/, $text) {
2204 2566 my ($w, $h) = $self->text_size ($line);
2205 my $height = $self->text_height ($text);
2206
2207 $self->{height} += $height; 2567 $self->{height} += $h;
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2569 }
2208 2570
2209 push @{$self->{par}}, [$height, $color, $text];
2210
2211 $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]);
2212 $self->{children}[1]->update;
2213} 2572}
2214 2573
2215sub update { 2574sub update {
2216 my ($self) = @_; 2575 my ($self) = @_;
2217 2576
… …
2219 2578
2220 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2221 2580
2222 delete $self->{texture}; 2581 delete $self->{texture};
2223 2582
2224 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585
2225 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2226 my $height = 0; 2587 my $height = 0;
2227 2588
2228 $height += $_->[0] = $self->text_height ($_->[2]) 2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2229 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 }
2230 2605
2231 $self->{height} = $height; 2606 $self->{height} = $height;
2232 2607
2233 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234 2609
2235 delete $self->{texture}; 2610 delete $self->{texture};
2236 } 2611 }
2237 2612
2238 $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 {
2239 glClearColor 0, 0, 0, 0; 2614 glClearColor 0, 0, 0, 0;
2240 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2241 2616
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2246 2618
2247 my $y0 = $top; 2619 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 2620 my $y1 = $top + $H;
2249 2621
2250 my $y = 0; 2622 my $y = 0;
2251 2623
2252 my $layout = $self->{layout}; 2624 my $layout = $self->{layout};
2253 2625
2254 $layout->set_font ($self->{font}) if $self->{font}; 2626 $layout->set_font ($self->{font}) if $self->{font};
2255 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
2256 for my $par (@{$self->{par}}) { 2632 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2633 my $h = $par->[1];
2258 2634
2259 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2260 $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});
2261 $layout->set_markup ($par->[2]); 2639 $layout->set_markup ($par->[4]);
2262 2640
2263 my ($W, $H) = $layout->size; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 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;
2265 } 2645 }
2266 2646
2267 $y += $h; 2647 $y += $h;
2268 } 2648 }
2269 2649
2270 glDisable GL_TEXTURE_2D; 2650 glDisable GL_BLEND;
2271 }; 2651 };
2272 }); 2652 });
2273} 2653}
2274 2654
2275sub _draw { 2655sub _draw {
2276 my ($self) = @_; 2656 my ($self) = @_;
2277 2657
2278 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2281 $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});
2282 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2283 2663
2284 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2285 2665
… …
2335 2715
2336sub new { 2716sub new {
2337 my $class = shift; 2717 my $class = shift;
2338 2718
2339 my $self = $class->SUPER::new ( 2719 my $self = $class->SUPER::new (
2340 state => 0, 2720 state => 0,
2341 connect_activate => \&toggle_flopper, 2721 on_activate => \&toggle_flopper,
2342 @_ 2722 @_
2343 ); 2723 );
2344 2724
2345 if ($self->{state}) {
2346 $self->{state} = 0;
2347 $self->toggle_flopper;
2348 }
2349
2350 $self 2725 $self
2351} 2726}
2352 2727
2353sub toggle_flopper { 2728sub toggle_flopper {
2354 my ($self) = @_; 2729 my ($self) = @_;
2355 2730
2356 # TODO: use animation 2731 $self->{other}->toggle_visibility;
2357 if ($self->{state} = !$self->{state}) {
2358 $CFClient::UI::ROOT->add ($self->{other});
2359 $self->{other}->move ($self->coord2global (0, $self->{h}));
2360 $self->emit ("open");
2361 } else {
2362 $CFClient::UI::ROOT->remove ($self->{other});
2363 $self->emit ("close");
2364 }
2365
2366 $self->emit (changed => $self->{state});
2367} 2732}
2368 2733
2369############################################################################# 2734#############################################################################
2370 2735
2371package CFClient::UI::Tooltip; 2736package CFClient::UI::Tooltip;
… …
2384} 2749}
2385 2750
2386sub set_tooltip_from { 2751sub set_tooltip_from {
2387 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2388 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
2389 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2390 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8, 2769 fontsize => 0.8,
2393 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2771 ellipsise => 0,
2394 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 ); 2773 );
2396} 2774}
2397 2775
2398sub size_request { 2776sub size_request {
2399 my ($self) = @_; 2777 my ($self) = @_;
… …
2405 2783
2406sub size_allocate { 2784sub size_allocate {
2407 my ($self, $w, $h) = @_; 2785 my ($self, $w, $h) = @_;
2408 2786
2409 $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 });
2410} 2806}
2411 2807
2412sub _draw { 2808sub _draw {
2413 my ($self) = @_; 2809 my ($self) = @_;
2414 2810
… …
2431 glVertex $w, $h; 2827 glVertex $w, $h;
2432 glVertex $w, 0; 2828 glVertex $w, 0;
2433 glEnd; 2829 glEnd;
2434 2830
2435 glTranslate 2 - 0.375, 2 - 0.375; 2831 glTranslate 2 - 0.375, 2 - 0.375;
2832
2436 $self->SUPER::_draw; 2833 $self->SUPER::_draw;
2437} 2834}
2438 2835
2439############################################################################# 2836#############################################################################
2440 2837
… …
2445use CFClient::OpenGL; 2842use CFClient::OpenGL;
2446 2843
2447sub new { 2844sub new {
2448 my $class = shift; 2845 my $class = shift;
2449 2846
2450 $class->SUPER::new ( 2847 my $self = $class->SUPER::new (
2451 aspect => 1, 2848 aspect => 1,
2849 can_events => 0,
2452 @_, 2850 @_,
2453 ) 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
2454} 2868}
2455 2869
2456sub size_request { 2870sub size_request {
2457 (32, 8) 2871 (32, 8)
2458} 2872}
2459 2873
2874sub update {
2875 my ($self) = @_;
2876
2877 return unless $self->{visible};
2878
2879 $self->SUPER::update;
2880}
2881
2460sub _draw { 2882sub _draw {
2461 my ($self) = @_; 2883 my ($self) = @_;
2462 2884
2463 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
2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465 2897
2466 # TODO animation
2467 if ($tex) { 2898 if ($tex) {
2468 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2473 } 2904 }
2474} 2905}
2475 2906
2907sub destroy {
2908 my ($self) = @_;
2909
2910 $self->{timer}->cancel
2911 if $self->{timer};
2912
2913 $self->SUPER::destroy;
2914}
2915
2476############################################################################# 2916#############################################################################
2477 2917
2478package CFClient::UI::InventoryItem; 2918package CFClient::UI::Buttonbar;
2479 2919
2480our @ISA = CFClient::UI::HBox::; 2920our @ISA = CFClient::UI::HBox::;
2481 2921
2482sub new { 2922# TODO: should actualyl wrap buttons and other goodies.
2483 my $class = shift;
2484
2485 my %args = @_;
2486
2487 my $item = delete $args{item};
2488
2489 my $desc = $item->{nrof} < 2
2490 ? $item->{name}
2491 : "$item->{nrof} $item->{name_pl}";
2492
2493
2494 my $self = $class->SUPER::new (
2495 can_hover => 1,
2496 can_events => 1,
2497 tooltip => (CFClient::UI::Label->escape ($desc)
2498 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499 connect_button_down => sub {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 # todo: maybe put examine on 1? but should just be a tooltip :(
2503 if ($ev->{button} == 1) {
2504 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505 } elsif ($ev->{button} == 2) {
2506 $::CONN->send ("apply $item->{tag}");
2507 } elsif ($ev->{button} == 3) {
2508 CFClient::UI::Menu->new (
2509 items => [
2510 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511 [
2512 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513 sub { $::CONN->send ("lock $item->{tag}") },
2514 ],
2515 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518 ],
2519 )->popup ($ev);
2520 }
2521
2522 1
2523 },
2524 %args
2525 );
2526
2527 $self->add (new CFClient::UI::Face
2528 can_events => 0,
2529 face => $item->{face},
2530 anim => $item->{anim},
2531 animspeed => $item->{animspeed},
2532 );
2533
2534 $self->add (new CFClient::UI::Label
2535 can_events => 0,
2536 text => $desc,
2537 );
2538
2539 $self
2540}
2541
2542#############################################################################
2543
2544package CFClient::UI::Inventory;
2545
2546our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548sub new {
2549 my $class = shift;
2550
2551 my $self = $class->SUPER::new (
2552 scrolled => (new CFClient::UI::VBox),
2553 @_,
2554 );
2555
2556 $self
2557}
2558
2559sub set_items {
2560 my ($self, $items) = @_;
2561
2562 $self->{scrolled}->clear;
2563 return unless $items;
2564
2565 my @items = sort {
2566 ($a->{type} <=> $b->{type})
2567 or ($a->{name} cmp $b->{name})
2568 } @$items;
2569
2570 $self->{real_items} = \@items;
2571
2572 for my $item (@items) {
2573 my $desc = $item->{nrof} < 2
2574 ? $item->{name}
2575 : "$item->{nrof} $item->{name_pl}";
2576
2577 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2578 }
2579
2580 $self->{scrolled}->add (@items);
2581
2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583}
2584
2585sub size_request {
2586 my ($self) = @_;
2587 ($self->{req_w}, $self->{req_h});
2588}
2589 2923
2590############################################################################# 2924#############################################################################
2591 2925
2592package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2593 2927
… …
2605 ); 2939 );
2606 2940
2607 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2608 2942
2609 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2610 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2611 2945
2612 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2613 if (!ref $widget) { 2947 if (!ref $widget) {
2614 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2615 can_hover => 1, 2949 can_hover => 1,
2616 can_events => 1, 2950 can_events => 1,
2617 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2618 } 2953 }
2619 2954
2620 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2621 2956
2622 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2627 2962
2628# 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)
2629sub popup { 2964sub popup {
2630 my ($self, $ev) = @_; 2965 my ($self, $ev) = @_;
2631 2966
2632 $self->emit ("popdown"); 2967 $self->_emit ("popdown");
2633 2968
2634 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2635 $GRAB = $self; 2970 $GRAB = $self;
2636 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2637 2972
2638 $self->show; 2973 $self->show;
2639 $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);
2640} 2975}
2641 2976
2642sub mouse_motion { 2977sub mouse_motion {
2643 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2644 2979
2645 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2646 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2647 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2648} 2985}
2649 2986
2650sub button_up { 2987sub button_up {
2651 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2652 2989
2653 if ($ev->{button} == $self->{button}) { 2990 if ($ev->{button} == $self->{button}) {
2654 undef $GRAB; 2991 undef $GRAB;
2655 $self->hide; 2992 $self->hide;
2656 2993
2657 $self->emit ("popdown"); 2994 $self->_emit ("popdown");
2658 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2659 } 3000 1
2660} 3001}
2661 3002
2662############################################################################# 3003#############################################################################
2663 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
2664package CFClient::UI::Statusbox; 3169package CFClient::UI::Statusbox;
2665 3170
2666our @ISA = CFClient::UI::VBox::; 3171our @ISA = CFClient::UI::VBox::;
2667 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
2668sub reorder { 3188sub reorder {
2669 my ($self) = @_; 3189 my ($self) = @_;
2670 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} };
2671 3196
2672 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2673 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2674 } 3199 }
2675 3200
… …
2678 my @items = sort { 3203 my @items = sort {
2679 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2680 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2681 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2682 3207
3208 $self->{timer}->interval (1);
3209
2683 my $count = 10 + 1; 3210 my $count = 10 + 1;
2684 for my $item (@items) { 3211 for my $item (@items) {
2685 last unless --$count; 3212 last unless --$count;
2686 3213
2687 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2688 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2689 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2690 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text}; 3218 : $item->{text};
2692 3219
2693 for ($short) { 3220 for ($short) {
2694 s/^\s+//; 3221 s/^\s+//;
2695 s/\012.*/…/s; 3222 s/\s+/ /g;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 } 3223 }
2699 3224
2700 new CFClient::UI::Label 3225 new CFClient::UI::Label
2701 markup => $short, 3226 markup => $short,
2702 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2706 color => $item->{color}, 3231 max_w => $::WIDTH * 0.44,
3232 fg => [@{ $item->{fg} }],
2707 can_events => 1, 3233 can_events => 1,
2708 can_hover => 1 3234 can_hover => 1
2709 }; 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;
2710 } 3248 }
2711 3249
2712 $self->clear; 3250 $self->clear;
2713 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2714} 3252}
… …
2717 my ($self, $text, %arg) = @_; 3255 my ($self, $text, %arg) = @_;
2718 3256
2719 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2720 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2721 3259
3260 return unless $text;
3261
2722 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2723 3263
2724 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725 3265
2726 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2727 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2728 $item->{count}++; 3268 $item->{count}++;
2729 } else { 3269 } else {
2730 $item->{count} = 1; 3270 $item->{count} = 1;
2731 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2732 } 3272 }
2733 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2734 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2735 delete $item->{label}; 3275 delete $item->{label};
2736 } else { 3276 } else {
2737 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2738 id => ++$self->{id}, 3278 id => ++$self->{id},
2739 text => $text, 3279 text => $text,
2740 timeout => $timeout, 3280 timeout => $timeout,
2741 tooltip => $text, 3281 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8], 3282 fg => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0, 3283 pri => 0,
2745 count => 1, 3284 count => 1,
2746 %arg, 3285 %arg,
2747 }; 3286 };
2748 } 3287 }
2749 3288
2750 $self->reorder; 3289 $self->reorder;
2751} 3290}
2752 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
2753############################################################################# 3310#############################################################################
2754 3311
2755package CFClient::UI::Root; 3312package CFClient::UI::Inventory;
2756 3313
2757our @ISA = CFClient::UI::Container::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
2758
2759use CFClient::OpenGL;
2760 3315
2761sub new { 3316sub new {
2762 my $class = shift; 3317 my $class = shift;
2763 3318
2764 $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 => [],
2765 @_, 3561 @_,
2766 ) 3562 )
2767} 3563}
2768 3564
2769sub configure { 3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2770 my ($self, $x, $y, $w, $h) = @_;
2771 3566
2772 $self->{w} = $w; 3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2773 $self->{h} = $h; 3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2774} 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");
2775 3577
2776sub 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 {
2777 my ($self) = @_; 3651 my ($self, $spell) = @_;
2778 3652
2779 $self->size_allocate ($self->{w}, $self->{h}) 3653 $self->{spell}->{$spell->{name}} = $spell;
2780 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
2781} 3692}
2782 3693
2783sub size_request { 3694sub size_request {
2784 my ($self) = @_; 3695 my ($self) = @_;
2785 3696
2786 ($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
2787} 3712}
2788 3713
2789sub size_allocate { 3714sub size_allocate {
2790 my ($self, $w, $h) = @_; 3715 my ($self, $w, $h) = @_;
2791 3716
2792 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2798 for my $child ($self->children) { 3717 for my $child ($self->children) {
2799 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)};
2800 3719
2801 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3720 $X = $child->{force_x} if exists $child->{force_x};
2802 $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
2803 $child->configure ($X, $Y, $W, $H); 3726 $child->configure ($X, $Y, $W, $H);
2804 } 3727 }
2805} 3728}
2806 3729
2807sub coord2local { 3730sub coord2local {
… …
2817} 3740}
2818 3741
2819sub update { 3742sub update {
2820 my ($self) = @_; 3743 my ($self) = @_;
2821 3744
2822 $self->check_size;
2823 $::WANT_REFRESH++; 3745 $::WANT_REFRESH++;
2824} 3746}
2825 3747
2826sub add { 3748sub add {
2827 my ($self, @children) = @_; 3749 my ($self, @children) = @_;
2828 3750
2829 for my $child (@children) {
2830 $child->{toplevel} = 1; 3751 $_->{is_toplevel} = 1
2831 3752 for @children;
2832 # integerise window positions
2833 $child->{x} = int $child->{x};
2834 $child->{y} = int $child->{y};
2835 }
2836 3753
2837 $self->SUPER::add (@children); 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 }
2838} 3770}
2839 3771
2840sub on_refresh { 3772sub on_refresh {
2841 my ($self, $id, $cb) = @_; 3773 my ($self, $id, $cb) = @_;
2842 3774
… …
2855 while ($self->{refresh_hook}) { 3787 while ($self->{refresh_hook}) {
2856 $_->() 3788 $_->()
2857 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
2858 } 3790 }
2859 3791
2860 if ($self->{check_size}) { 3792 if ($self->{realloc}) {
2861 my @queue = ([], []); 3793 my %queue;
3794 my @queue;
3795 my $widget;
2862 3796
2863 for (;;) { 3797 outer:
2864 if ($self->{check_size}) { 3798 while () {
2865 # heuristic: check containers last 3799 if (my $realloc = delete $self->{realloc}) {
2866 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3800 for $widget (values %$realloc) {
2867 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 }
2868 } 3807 }
2869 3808
2870 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3809 while () {
3810 @queue or last outer;
2871 3811
2872 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3812 $widget = pop @{ $queue[-1] || [] }
2873 ? @$widget{qw(user_w user_h)} 3813 and last;
2874 : $widget->size_request;
2875
2876 if (delete $widget->{force_alloc}
2877 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2879 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}) {
2880 $widget->{req_w} = $w; 3833 $widget->{req_w} = $w;
2881 $widget->{req_h} = $h; 3834 $widget->{req_h} = $h;
2882 3835
2883 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3836 $self->{size_alloc}{$widget+0} = $widget;
2884 3837
2885 $widget->{parent}->check_size
2886 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 }
2887 } 3845 }
3846
3847 delete $self->{realloc}{$widget+0};
2888 } 3848 }
2889 } 3849 }
2890 3850
2891 while ($self->{size_alloc}) { 3851 while (my $size_alloc = delete $self->{size_alloc}) {
2892 for (values %{delete $self->{size_alloc}}) { 3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
2893 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)};
2894 3859
2895 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
2896 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
2897 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
2898 $widget->{w} = $w; 3870 $widget->{w} = $w;
2899 $widget->{h} = $h; 3871 $widget->{h} = $h;
2900 $widget->size_allocate ($w, $h); 3872
2901 $widget->emit (size_allocate => $w, $h); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
2902 } 3875 }
2903 } 3876 }
2904 3877
2905 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
2906 $_->() 3879 $_->()
2907 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
2908 } 3881 }
2909 3882
3883
2910 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
2913 3887
2914 glMatrixMode GL_PROJECTION; 3888 glMatrixMode GL_PROJECTION;
2915 glLoadIdentity; 3889 glLoadIdentity;
2916 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
2918 glLoadIdentity; 3892 glLoadIdentity;
2919 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
2920 $self->_draw; 3901 $self->_draw;
2921} 3902}
2922 3903
2923############################################################################# 3904#############################################################################
2924 3905
2925package CFClient::UI; 3906package CFClient::UI;
2926 3907
2927$ROOT = new CFClient::UI::Root; 3908$ROOT = new CFClient::UI::Root;
2928$TOOLTIP = new CFClient::UI::Tooltip; 3909$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929 3910
29301 39111
2931 3912

Diff Legend

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