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.229 by root, Wed May 24 21:49:58 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC

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

Diff Legend

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