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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 2007 UTC

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

Diff Legend

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