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.217 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.347 by root, Mon Aug 14 03:41:28 2006 UTC

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

Diff Legend

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