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.225 by root, Tue May 23 21:14:41 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC

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

Diff Legend

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