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

Diff Legend

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