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

Diff Legend

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