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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC

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

Diff Legend

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