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.199 by root, Fri May 12 15:45:42 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 2007 UTC

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

Diff Legend

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