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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.287 by root, Mon Jun 5 05:31:13 2006 UTC

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

Diff Legend

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