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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.375 by root, Mon Jul 16 20:12:19 2007 UTC

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

Diff Legend

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