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

Diff Legend

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