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

Diff Legend

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