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

Diff Legend

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