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

Diff Legend

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