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

Diff Legend

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