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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.314 by root, Mon Jun 26 21:59:04 2006 UTC

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

Diff Legend

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