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.66 by root, Tue Apr 11 14:36:02 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 12:29:46 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64 62
65 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
67 65
68 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
69 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for ($vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
84}
85
86#############################################################################
87
88package CFClient::UI::Base;
89
90use strict;
91
92use SDL::OpenGL;
74 93
75sub new { 94sub new {
76 my $class = shift; 95 my $class = shift;
77 96
78 bless { 97 my $self = bless {
79 x => 0, 98 x => 0,
80 y => 0, 99 y => 0,
81 z => 0, 100 z => 0,
101 w => -1,
102 h => -1,
82 @_ 103 @_
83 }, $class 104 }, $class;
105
106 for (keys %$self) {
107 if (/^connect_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_});
109 }
110 }
111
112 $self
84} 113}
85 114
86sub move { 115sub move {
87 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
88 $self->{x} = $x; 117 $self->{x} = $x;
… …
97sub size_request { 126sub size_request {
98 require Carp; 127 require Carp;
99 Carp::confess "size_request is abtract"; 128 Carp::confess "size_request is abtract";
100} 129}
101 130
102sub size_allocate { 131sub _size_allocate {
103 my ($self, $w, $h) = @_; 132 my ($self, $x, $y, $w, $h) = @_;
133
134 $self->{x} = $x;
135 $self->{y} = $y;
136
137 return unless $self->{w} != $w || $self->{h} != $h;
104 138
105 $self->{w} = $w; 139 $self->{w} = $w;
106 $self->{h} = $h; 140 $self->{h} = $h;
107}
108 141
142 1
143}
144
145sub size_allocate {
146 my ($self, $x, $y, $w, $h) = @_;
147
148 $self->_size_allocate ($x, $y, $w, $h);
149}
150
109# translate global koordinates to local coordinate system 151# translate global coordinates to local coordinate system
110sub translate { 152sub translate {
111 my ($self, $x, $y) = @_; 153 my ($self, $x, $y) = @_;
112 154
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 155 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
114} 156}
115 157
116sub focus_in { 158sub focus_in {
117 my ($self) = @_; 159 my ($self) = @_;
160
161 return if $FOCUS == $self;
162 return unless $self->{can_focus};
118 163
119 my $focus = $FOCUS; $FOCUS = $self; 164 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus; 165 $focus->update if $focus;
121 $FOCUS->update; 166 $FOCUS->update;
122} 167}
… …
130 $focus->update if $focus; #? 175 $focus->update if $focus; #?
131} 176}
132 177
133sub mouse_motion { } 178sub mouse_motion { }
134sub button_up { } 179sub button_up { }
135sub button_down { }
136sub key_down { } 180sub key_down { }
137sub key_up { } 181sub key_up { }
182
183sub button_down {
184 my ($self, $ev, $x, $y) = @_;
185
186 $self->focus_in;
187}
138 188
139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 189sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 190sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 191sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 192sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 193sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
144 194
145sub draw { 195sub draw {
146 my ($self) = @_; 196 my ($self) = @_;
147 197
198 return unless $self->{h} && $self->{w};
199
148 glPushMatrix; 200 glPushMatrix;
149 glTranslate $self->{x}, $self->{y}, 0; 201 glTranslate $self->{x}, $self->{y}, 0;
150 $self->_draw; 202 $self->_draw;
151 if ($self == $HOVER) { 203 glPopMatrix;
152 glColor 1, 1, 1, 0.4; 204
205 if ($self == $HOVER && $self->{can_hover}) {
206 my ($x, $y) = @$self{qw(x y)};
207
208 glColor 0, 0, 1, 0.2;
153 glEnable GL_BLEND; 209 glEnable GL_BLEND;
210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154 glBegin GL_QUADS; 211 glBegin GL_QUADS;
155 glVertex 0 , 0; 212 glVertex $x , $y;
156 glVertex $self->{w}, 0; 213 glVertex $x + $self->{w}, $y;
157 glVertex $self->{w}, $self->{h}; 214 glVertex $x + $self->{w}, $y + $self->{h};
158 glVertex 0 , $self->{h}; 215 glVertex $x , $y + $self->{h};
159 glEnd; 216 glEnd;
160 glDisable GL_BLEND; 217 glDisable GL_BLEND;
161 } 218 }
162 glPopMatrix;
163} 219}
164 220
165sub _draw { 221sub _draw {
166 my ($self) = @_; 222 my ($self) = @_;
167 223
168 warn "no draw defined for $self\n"; 224 warn "no draw defined for $self\n";
169}
170
171sub bbox {
172 my ($self) = @_;
173 my ($w, $h) = $self->size_request;
174 (
175 $self->{x},
176 $self->{y},
177 $self->{x} = $w,
178 $self->{y} = $h
179 )
180} 225}
181 226
182sub find_widget { 227sub find_widget {
183 my ($self, $x, $y) = @_; 228 my ($self, $x, $y) = @_;
184 229
… …
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 232 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188 233
189 () 234 ()
190} 235}
191 236
192sub del_parent { $_[0]->{parent} = undef }
193
194sub set_parent { 237sub set_parent {
195 my ($self, $par) = @_; 238 my ($self, $par) = @_;
196 239
197 $self->{parent} = $par; 240 $self->{parent} = $par;
198 Scalar::Util::weaken $self->{parent}; 241 Scalar::Util::weaken $self->{parent};
… …
207 250
208 $self->{parent}->update 251 $self->{parent}->update
209 if $self->{parent}; 252 if $self->{parent};
210} 253}
211 254
255sub connect {
256 my ($self, $signal, $cb) = @_;
257
258 push @{ $self->{cb}{$signal} }, $cb;
259}
260
261sub emit {
262 my ($self, $signal, @args) = @_;
263
264 $_->($self, @args)
265 for @{$self->{cb}{$signal} || []};
266}
267
212sub DESTROY { 268sub DESTROY {
213 my ($self) = @_; 269 my ($self) = @_;
214 270
215 #$self->deactivate; 271 #$self->deactivate;
216} 272}
217 273
218############################################################################# 274#############################################################################
219 275
276package CFClient::UI::DrawBG;
277
278our @ISA = CFClient::UI::Base::;
279
280use strict;
281use SDL::OpenGL;
282
283sub new {
284 my $class = shift;
285
286 # range [value, low, high, page]
287
288 $class->SUPER::new (
289 bg => [0, 0, 0, 0.2],
290 active_bg => [1, 1, 1, 0.5],
291 @_
292 )
293}
294
295sub _draw {
296 my ($self) = @_;
297
298 my ($w, $h) = @$self{qw(w h)};
299
300 glEnable GL_BLEND;
301 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
302 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
303
304 glBegin GL_QUADS;
305 glVertex 0 , 0;
306 glVertex 0 , $h;
307 glVertex $w, $h;
308 glVertex $w, 0;
309 glEnd;
310
311 glDisable GL_BLEND;
312}
313
314#############################################################################
315
220package CFClient::Widget::Empty; 316package CFClient::UI::Empty;
221 317
222our @ISA = CFClient::Widget::; 318our @ISA = CFClient::UI::Base::;
223 319
224sub size_request { 320sub size_request {
225 (0, 0) 321 (0, 0)
226} 322}
227 323
228sub draw { 324sub draw { }
229}
230 325
231############################################################################# 326#############################################################################
232 327
233package CFClient::Widget::Container; 328package CFClient::UI::Container;
234 329
235our @ISA = CFClient::Widget::; 330our @ISA = CFClient::UI::Base::;
236 331
237sub new { 332sub new {
238 my ($class, %arg) = @_; 333 my ($class, %arg) = @_;
239 334
240 my $children = delete $arg{children} || []; 335 my $children = delete $arg{children} || [];
… …
244 339
245 $self 340 $self
246} 341}
247 342
248sub add { 343sub add {
249 my ($self, $chld, $expand) = @_; 344 my ($self, $chld) = @_;
250 345
251 $chld->{expand} = $expand;
252 $chld->set_parent ($self); 346 $chld->set_parent ($self);
253 347
254 $self->{children} = [ 348 $self->{children} = [
255 sort { $a->{z} <=> $b->{z} } 349 sort { $a->{z} <=> $b->{z} }
256 @{$self->{children}}, $chld 350 @{$self->{children}}, $chld
257 ]; 351 ];
258 352
259 $self->size_allocate ($self->{w}, $self->{h}) 353 $self->{w} = $self->{h} = -1;
260 if $self->{w}; #TODO: check for "realised state" 354 $self->update;
261} 355}
262 356
263sub remove { 357sub remove {
264 my ($self, $widget) = @_; 358 my ($self, $widget) = @_;
265 359
266 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 360 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
267 361
268 $self->size_allocate ($self->{w}, $self->{h}); 362 $self->size_allocate (0, 0, $self->{w}, $self->{h});
269} 363}
270 364
271sub find_widget { 365sub find_widget {
272 my ($self, $x, $y) = @_; 366 my ($self, $x, $y) = @_;
273 367
… …
290 $_->draw for @{$self->{children}}; 384 $_->draw for @{$self->{children}};
291} 385}
292 386
293############################################################################# 387#############################################################################
294 388
295package CFClient::Widget::Bin; 389package CFClient::UI::Bin;
296 390
297our @ISA = CFClient::Widget::Container::; 391our @ISA = CFClient::UI::Container::;
298 392
299sub new { 393sub new {
300 my ($class, %arg) = @_; 394 my ($class, %arg) = @_;
301 395
302 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::; 396 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
303 397
304 $class->SUPER::new (children => [$child], %arg) 398 $class->SUPER::new (children => [$child], %arg)
305} 399}
306 400
307sub add { 401sub add {
… …
315sub remove { 409sub remove {
316 my ($self, $widget) = @_; 410 my ($self, $widget) = @_;
317 411
318 $self->SUPER::remove ($widget); 412 $self->SUPER::remove ($widget);
319 413
320 $self->{children} = [new CFClient::Widget::Empty] 414 $self->{children} = [new CFClient::UI::Empty]
321 unless @{$self->{children}}; 415 unless @{$self->{children}};
322} 416}
323 417
324sub child { $_[0]->{children}[0] } 418sub child { $_[0]->{children}[0] }
325 419
326sub size_request { 420sub size_request {
327 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 421 $_[0]{children}[0]->size_request
328} 422}
329 423
330sub size_allocate { 424sub size_allocate {
331 my ($self, $w, $h) = @_; 425 my ($self, $x, $y, $w, $h) = @_;
332 426
333 $self->SUPER::size_allocate ($w, $h); 427 $self->_size_allocate ($x, $y, $w, $h) or return;
428
334 $self->{children}[0]->size_allocate ($w, $h) 429 $self->{children}[0]->size_allocate (0, 0, $w, $h);
335 if $self->{children}[0]
336} 430}
337 431
338############################################################################# 432#############################################################################
339 433
340package CFClient::Widget::Window; 434package CFClient::UI::Window;
341 435
342our @ISA = CFClient::Widget::Bin::; 436our @ISA = CFClient::UI::Bin::;
343 437
344use SDL::OpenGL; 438use SDL::OpenGL;
345 439
346sub new { 440sub new {
347 my ($class, %arg) = @_; 441 my ($class, %arg) = @_;
… …
358} 452}
359 453
360sub render_chld { 454sub render_chld {
361 my ($self) = @_; 455 my ($self) = @_;
362 456
363 $self->{texture} = 457 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
364 CFClient::Texture->new_from_opengl ( 458 glClearColor 0, 0, 0, 1;
365 $self->{w}, $self->{h}, sub { $self->child->draw } 459 glClear GL_COLOR_BUFFER_BIT;
366 ); 460 $self->child->draw;
461 };
367} 462}
368 463
369sub size_allocate { 464sub size_allocate {
370 my ($self, $w, $h) = @_; 465 my ($self, $x, $y, $w, $h) = @_;
371 466
372 $self->{w} = $w; 467 $self->_size_allocate ($x, $y, $w, $h) or return;
373 $self->{h} = $h;
374 468
375 $self->child->size_allocate ($w, $h); 469 $self->child->size_allocate (0, 0, $w, $h);
376 470
377 $self->render_chld; 471 $self->render_chld;
378} 472}
379 473
380sub _draw { 474sub _draw {
… …
384 478
385 my $tex = $self->{texture} 479 my $tex = $self->{texture}
386 or return; 480 or return;
387 481
388 glEnable GL_BLEND; 482 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
389 glEnable GL_TEXTURE_2D; 484 glEnable GL_TEXTURE_2D;
390 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
391 486
392 $tex->draw_quad (0, 0, $w, $h); 487 $tex->draw_quad (0, 0, $w, $h);
393 488
… …
395 glDisable GL_TEXTURE_2D; 490 glDisable GL_TEXTURE_2D;
396} 491}
397 492
398############################################################################# 493#############################################################################
399 494
400package CFClient::Widget::Frame; 495package CFClient::UI::Frame;
401 496
402our @ISA = CFClient::Widget::Bin::; 497our @ISA = CFClient::UI::Bin::;
403 498
404use SDL::OpenGL; 499use SDL::OpenGL;
405 500
406sub size_request { 501sub size_request {
407 my ($self) = @_; 502 my ($self) = @_;
… …
412 507
413 map { $_ + 4 } $chld->size_request; 508 map { $_ + 4 } $chld->size_request;
414} 509}
415 510
416sub size_allocate { 511sub size_allocate {
417 my ($self, $w, $h) = @_; 512 my ($self, $x, $y, $w, $h) = @_;
418 513
419 $self->{w} = $w; 514 $self->_size_allocate ($x, $y, $w, $h) or return;
420 $self->{h} = $h;
421 515
422 $self->child->size_allocate ($w - 4, $h - 4); 516 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
423 $self->child->move (2, 2);
424} 517}
425 518
426sub _draw { 519sub _draw {
427 my ($self) = @_; 520 my ($self) = @_;
428 521
… …
441 $chld->draw; 534 $chld->draw;
442} 535}
443 536
444############################################################################# 537#############################################################################
445 538
446package CFClient::Widget::FancyFrame; 539package CFClient::UI::FancyFrame;
447 540
448our @ISA = CFClient::Widget::Bin::; 541our @ISA = CFClient::UI::Bin::;
449 542
450use SDL::OpenGL; 543use SDL::OpenGL;
451 544
452my @tex = 545my @tex =
453 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 546 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
454 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 547 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
455 548
549sub new {
550 my $class = shift;
551
552 # TODO: user_x, user_y, overwrite moveto?
553
554 $class->SUPER::new (
555 bg => [1, 1, 1, 1],
556 border_bg => [1, 1, 1, 1],
557 border => $::FONTSIZE * 0.8,
558 @_
559 )
560}
561
456sub size_request { 562sub size_request {
457 my ($self) = @_; 563 my ($self) = @_;
458 564
565 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
566
459 my ($w, $h) = $self->SUPER::size_request; 567 my ($w, $h) = $self->SUPER::size_request;
460 568
461 $h += $tex[1]->{height}; 569 (
462 $h += $tex[4]->{height}; 570 $w + $self->{border} * 2,
463 $w += $tex[2]->{width}; 571 $h + $self->{border} * 2,
464 $w += $tex[3]->{width}; 572 )
465
466 ($w, $h)
467} 573}
468 574
469sub size_allocate { 575sub size_allocate {
470 my ($self, $w, $h) = @_; 576 my ($self, $x, $y, $w, $h) = @_;
471 577
472 $self->SUPER::size_allocate ($w, $h); 578 $self->_size_allocate ($x, $y, $w, $h) or return;
473 579
474 $h -= $tex[1]->{height}; 580 $h -= List::Util::max 0, $self->{border} * 2;
475 $h -= $tex[4]->{height}; 581 $w -= List::Util::max 0, $self->{border} * 2;
476 $w -= $tex[2]->{width};
477 $w -= $tex[3]->{width};
478 582
479 $h = $h < 0 ? 0 : $h; 583 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
480 $w = $w < 0 ? 0 : $w; 584}
481 585
482 my $child = $self->child; 586sub button_down {
587 my ($self, $ev, $x, $y) = @_;
483 588
484 $child->size_allocate ($w, $h); 589 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
485 $child->move ($tex[3]->{width}, $tex[1]->{height}); 590 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
591
592 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
593 my ($bw, $bh) = ($self->{w}, $self->{h});
594
595 $self->{motion} = sub {
596 my ($ev, $x, $y) = @_;
597
598 ($x, $y) = ($ev->motion_x, $ev->motion_y);
599
600 $self->{user_w} = $bw + $x - $ox;
601 $self->{user_h} = $bh + $y - $oy;
602 $self->update;
603 };
604
605 } elsif ($x >= 0 && $x < $self->{w}
606 && $y >= 0 && $y < $self->{border}) {
607
608 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
609 my ($bx, $by) = ($self->{x}, $self->{y});
610
611 $self->{motion} = sub {
612 my ($ev, $x, $y) = @_;
613
614 ($x, $y) = ($ev->motion_x, $ev->motion_y);
615
616 $self->move ($bx + $x - $ox, $by + $y - $oy);
617 $self->update;
618 };
619 }
620}
621
622sub button_up {
623 my ($self, $ev, $x, $y) = @_;
624
625 delete $self->{motion};
626}
627
628sub mouse_motion {
629 my ($self, $ev, $x, $y) = @_;
630
631 $self->{motion}->($ev, $x, $y) if $self->{motion};
486} 632}
487 633
488sub _draw { 634sub _draw {
489 my ($self) = @_; 635 my ($self) = @_;
490 636
491 my ($w, $h) = ($self->{w}, $self->{h}); 637 my ($w, $h ) = ($self->{w}, $self->{h});
492 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 638 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
493 639
494 glEnable GL_BLEND; 640 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
495 glEnable GL_TEXTURE_2D; 642 glEnable GL_TEXTURE_2D;
496 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
497 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
498 644
499 my $top = $tex[1]; 645 glColor @{ $self->{border_bg} };
500 $top->draw_quad (0, 0, $w, $top->{height}); 646 $tex[1]->draw_quad (0, 0, $w, $self->{border});
501 647 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
502 my $left = $tex[3]; 648 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
503 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 649 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
504
505 my $right = $tex[2];
506 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
507
508 my $bottom = $tex[4];
509 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
510 650
511 my $bg = $tex[0]; 651 my $bg = $tex[0];
512 glBindTexture GL_TEXTURE_2D, $bg->{name};
513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
515 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
516 652
653 # TODO: repeat texture not scale
517 my $rep_x = $cw / $bg->{width}; 654 my $rep_x = $cw / $bg->{w};
518 my $rep_y = $ch / $bg->{height}; 655 my $rep_y = $ch / $bg->{h};
519 656
657 glColor @{ $self->{bg} };
658
659 $bg->{s} = $rep_x;
660 $bg->{t} = $rep_y;
661 $bg->{wrap_mode} = 1;
520 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 662 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
521 663
664 glDisable GL_TEXTURE_2D;
522 glDisable GL_BLEND; 665 glDisable GL_BLEND;
523 glDisable GL_TEXTURE_2D;
524 666
525 $self->child->draw; 667 $self->child->draw;
526
527} 668}
528 669
529############################################################################# 670#############################################################################
530 671
531package CFClient::Widget::Table; 672package CFClient::UI::Table;
532 673
533our @ISA = CFClient::Widget::Bin::; 674our @ISA = CFClient::UI::Base::;
675
676use List::Util qw(max sum);
534 677
535use SDL::OpenGL; 678use SDL::OpenGL;
679
680sub new {
681 my $class = shift;
682
683 $class->SUPER::new (
684 col_expand => [],
685 @_
686 )
687}
536 688
537sub add { 689sub add {
538 my ($self, $x, $y, $chld) = @_; 690 my ($self, $x, $y, $chld) = @_;
539 my $old_chld = $self->{children}[$y][$x];
540 691
541 $self->{children}[$y][$x] = $chld; 692 $self->{children}[$y][$x] = $chld;
542 $chld->set_parent ($self); 693 $chld->set_parent ($self);
694
695 $self->{w} = $self->{h} = -1;
543 $self->update; 696 $self->update;
544} 697}
545 698
546sub max_row_height { 699sub get_wh {
547 my ($self, $row) = @_; 700 my ($self) = @_;
548 701
549 my $hs = 0; 702 my (@w, @h);
550 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 703
704 for my $y (0 .. $#{$self->{children}}) {
551 my $c = $self->{children}->[$row]->[$xi]; 705 my $row = $self->{children}[$y]
552 if ($c) { 706 or next;
707
708 for my $x (0 .. $#$row) {
709 my $widget = $row->[$x]
710 or next;
553 my ($w, $h) = $c->size_request; 711 my ($w, $h) = $widget->size_request;
554 if ($hs < $h) { $hs = $h } 712
713 $w[$x] = max $w[$x], $w;
714 $h[$y] = max $h[$y], $h;
555 } 715 }
556 } 716 }
557 return $hs;
558}
559 717
560sub max_col_width { 718 (\@w, \@h)
719}
720
721sub size_request {
561 my ($self, $col) = @_; 722 my ($self) = @_;
562 723
724 my ($ws, $hs) = $self->get_wh;
725
726 (
727 (sum @$ws),
728 (sum @$hs),
729 )
730}
731
732sub size_allocate {
733 my ($self, $x, $y, $w, $h) = @_;
734
735 $self->_size_allocate ($x, $y, $w, $h) or return;
736
737 my ($ws, $hs) = $self->get_wh;
738
739 my $req_w = sum @$ws;
740 my $req_h = sum @$hs;
741
742 # TODO: nicer code && do row_expand
743 my @col_expand = @{$self->{col_expand}};
744 @col_expand = (1) x @$ws unless @col_expand;
745 my $col_expand = (sum @col_expand) || 1;
746
747 # linearly scale sizes
748 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
749 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
750
751 CFClient::UI::harmonize $ws;
752 CFClient::UI::harmonize $hs;
753
754 my $y;
755
756 for my $r (0 .. $#{$self->{children}}) {
757 my $row = $self->{children}[$r]
758 or next;
759
563 my $ws = 0; 760 my $x = 0;
564 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 761 my $row_h = $hs->[$r];
565 my $c = ($self->{children}->[$yi] || [])->[$col]; 762
566 if ($c) { 763 for my $c (0 .. $#$row) {
567 my ($w, $h) = $c->size_request; 764 my $col_w = $ws->[$c];
568 if ($ws < $w) { $ws = $w } 765
766 if (my $widget = $row->[$c]) {
767 $widget->size_allocate ($x, $y, $col_w, $row_h);
768 }
769
770 $x += $col_w;
569 } 771 }
772
773 $y += $row_h;
570 } 774 }
571 return $ws; 775
572} 776}
777
778sub find_widget {
779 my ($self, $x, $y) = @_;
780
781 $x -= $self->{x};
782 $y -= $self->{y};
783
784 my $res;
785
786 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
787 $res = $_->find_widget ($x, $y)
788 and return $res;
789 }
790
791 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
792}
793
794sub _draw {
795 my ($self) = @_;
796
797 for (grep $_, @{$self->{children}}) {
798 $_->draw for grep $_, @$_;
799 }
800}
801
802#############################################################################
803
804package CFClient::UI::HBox;
805
806# TODO: wrap into common Box base class
807
808our @ISA = CFClient::UI::Container::;
573 809
574sub size_request { 810sub size_request {
575 my ($self) = @_; 811 my ($self) = @_;
576 812
813 my @alloc = map [$_->size_request], @{$self->{children}};
814
815 (
816 (List::Util::sum map $_->[0], @alloc),
817 (List::Util::max map $_->[1], @alloc),
818 )
819}
820
821sub size_allocate {
822 my ($self, $x, $y, $w, $h) = @_;
823
824 $self->_size_allocate ($x, $y, $w, $h);
825
577 my ($hs, $ws) = (0, 0); 826 ($h, $w) = ($w, $h);
578 827
579 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 828 my $children = $self->{children};
580 $hs += $self->max_row_height ($yi);
581 }
582 829
583 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 830 my @h = map +($_->size_request)[0], @$children;
584 my $wm = 0; 831
585 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 832 my $req_h = List::Util::sum @h;
586 $wm += $self->max_col_width ($xi) 833
834 if ($req_h > $h) {
835 # ah well, not enough space
836 $_ *= $h / $req_h for @h;
837 } else {
838 my $exp = List::Util::sum map $_->{expand}, @$children;
839 $exp ||= 1;
840
841 for (0 .. $#$children) {
842 my $child = $children->[$_];
843
844 my $alloc_h = $h[$_];
845 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
846 $h[$_] = $alloc_h;
587 } 847 }
588 if ($ws < $wm) { $ws = $wm }
589 } 848 }
590 849
591 return ($ws, $hs); 850 CFClient::UI::harmonize \@h;
592}
593
594sub _draw {
595 my ($self) = @_;
596 851
597 my $y = 0; 852 my $y = 0;
598 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 853 for (0 .. $#$children) {
854 my $child = $children->[$_];
599 my $x = 0; 855 my $h = $h[$_];
856 $child->size_allocate ($y, 0, $h, $w);
600 857
601 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 858 $y += $h;
602
603 my $c = $self->{children}->[$yi]->[$xi];
604 if ($c) {
605 $c->move ($x, $y, 0); #TODO: Move to size_request
606 $c->draw if $c;
607 }
608
609 $x += $self->max_col_width ($xi);
610 }
611
612 $y += $self->max_row_height ($yi);
613 } 859 }
614} 860}
615 861
616############################################################################# 862#############################################################################
617 863
618package CFClient::Widget::VBox; 864package CFClient::UI::VBox;
619 865
866# TODO: wrap into common Box base class
867
620our @ISA = CFClient::Widget::Container::; 868our @ISA = CFClient::UI::Container::;
621
622use SDL::OpenGL;
623 869
624sub size_request { 870sub size_request {
625 my ($self) = @_; 871 my ($self) = @_;
626 872
627 my @alloc = map [$_->size_request], @{$self->{children}}; 873 my @alloc = map [$_->size_request], @{$self->{children}};
… …
631 (List::Util::sum map $_->[1], @alloc), 877 (List::Util::sum map $_->[1], @alloc),
632 ) 878 )
633} 879}
634 880
635sub size_allocate { 881sub size_allocate {
636 my ($self, $w, $h) = @_; 882 my ($self, $x, $y, $w, $h) = @_;
637 883
638 $self->w ($w); 884 $self->_size_allocate ($x, $y, $w, $h);
639 $self->h ($h);
640 885
641 my $exp; 886 my $children = $self->{children};
642 my @oth; 887
643 # find expand widget 888 my @h = map +($_->size_request)[1], @$children;
644 for (@{$self->{children}}) { 889
645 if ($_->{expand}) { 890 my $req_h = List::Util::sum @h;
891
892 if ($req_h > $h) {
893 # ah well, not enough space
894 $_ *= $h / $req_h for @h;
895 } else {
896 my $exp = List::Util::sum map $_->{expand}, @$children;
646 $exp = $_; 897 $exp ||= 1;
647 last; 898
899 for (0 .. $#$children) {
900 my $child = $children->[$_];
901
902 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
648 } 903 }
649 push @oth, $_;
650 } 904 }
651 905
652 my ($ow, $oh); 906 CFClient::UI::harmonize \@h;
653
654 # get sizes of other widgets
655 for (@oth) {
656 my ($w, $h) = $_->size_request;
657 $oh += $h;
658 if ($ow < $w) { $ow = $w }
659 }
660 907
661 my $y = 0; 908 my $y = 0;
662 for (@{$self->{children}}) { 909 for (0 .. $#$children) {
663 $_->move (0, $y); 910 my $child = $children->[$_];
664 911 my $h = $h[$_];
665 if ($_ == $exp) {
666 $_->size_allocate ($w, $h - $oh);
667 $y += $h - $oh;
668 } else {
669 my ($cw, $h) = $_->size_request;
670 $_->size_allocate ($w, $h); 912 $child->size_allocate (0, $y, $w, $h);
913
671 $y += $h; 914 $y += $h;
672 }
673 } 915 }
674} 916}
675 917
676############################################################################# 918#############################################################################
677 919
678package CFClient::Widget::Label; 920package CFClient::UI::Label;
679 921
680our @ISA = CFClient::Widget::; 922our @ISA = CFClient::UI::Base::;
681 923
682use SDL::OpenGL; 924use SDL::OpenGL;
683 925
684sub new { 926sub new {
685 my ($class, %arg) = @_; 927 my ($class, %arg) = @_;
686 928
687 # TODO: color, and make height, xyz etc. optional
688 my $self = $class->SUPER::new ( 929 my $self = $class->SUPER::new (
689 color => [1, 1, 1], 930 fg => [1, 1, 1],
690 height => $::FONTSIZE, 931 fontsize => $::FONTSIZE,
691 text => "", 932 text => "",
933 align => -1,
934 padding => 2,
692 layout => new CFClient::Layout, 935 layout => new CFClient::Layout,
693 %arg 936 %arg
694 ); 937 );
695 938
696 $self->set_text ($self->{text}); 939 $self->set_text ($self->{text});
697 940
698 $self 941 $self
699} 942}
700 943
944sub escape_text {
945 local $_ = $_[1];
946
947 s/&/&amp;/g;
948 s/>/&gt;/g;
949 s/</&lt;/g;
950
951 $_[1]
952}
953
701sub set_text { 954sub set_text {
702 my ($self, $text) = @_; 955 my ($self, $text) = @_;
703 956
704 $self->{text} = $text; 957 $self->{text} = $text;
705 $self->{layout}->set_markup ($text); 958 $self->{layout}->set_markup ($text);
706 959
707 delete $self->{texture}; 960 delete $self->{texture};
961# $self->{w} = $self->{h} = -1;
962 $self->update;
708} 963}
709 964
710sub get_text { 965sub get_text {
711 my ($self, $text) = @_; 966 my ($self, $text) = @_;
712 967
… …
715 970
716sub size_request { 971sub size_request {
717 my ($self) = @_; 972 my ($self) = @_;
718 973
719 $self->{layout}->set_width; 974 $self->{layout}->set_width;
720 $self->{layout}->set_height ($self->{height}); 975 $self->{layout}->set_height ($self->{fontsize});
721 $self->{layout}->size 976 my ($w, $h) = $self->{layout}->size;
722# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 977
723# ( 978 (
724# $self->{texture}{width}, 979 $w + $self->{padding} * 2,
725# $self->{texture}{height}, 980 $h + $self->{padding} * 2,
726# ) 981 )
727# } else {
728# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
729#
730# ($w, $h)
731# }
732} 982}
733 983
734sub size_allocate { 984sub size_allocate {
735 my ($self, $w, $h) = @_; 985 my ($self, $x, $y, $w, $h) = @_;
736 986
737 $self->SUPER::size_allocate ($w, $h); 987 $self->_size_allocate ($x, $y, $w, $h) or return;
988
738 delete $self->{texture}; 989 delete $self->{texture};
990}
991
992sub update {
993 my ($self) = @_;
994
995 delete $self->{texture};
996 $self->SUPER::update;
739} 997}
740 998
741sub _draw { 999sub _draw {
742 my ($self) = @_; 1000 my ($self) = @_;
743 1001
744 my $tex = $self->{texture} ||= do { 1002 my $tex = $self->{texture} ||= do {
745 $self->{layout}->set_width ($self->{w}); 1003 $self->{layout}->set_width ($self->{w});
1004 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
746 new_from_layout CFClient::Texture $self->{layout}; 1005 new_from_layout CFClient::Texture $self->{layout}
747 }; 1006 };
1007
1008 glEnable GL_BLEND;
1009 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1010 glEnable GL_TEXTURE_2D;
1011 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1012
1013 glColor @{$self->{fg}};
1014
1015 my $x =
1016 $self->{align} < 0 ? $self->{padding}
1017 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1018 : ($self->{w} - $tex->{w}) * 0.5;
1019
1020 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1021
1022 glDisable GL_TEXTURE_2D;
1023 glDisable GL_BLEND;
1024}
1025
1026#############################################################################
1027
1028package CFClient::UI::Entry;
1029
1030our @ISA = CFClient::UI::Label::;
1031
1032use SDL;
1033use SDL::OpenGL;
1034
1035sub new {
1036 my $class = shift;
1037
1038 $class->SUPER::new (
1039 fg => [1, 1, 1],
1040 bg => [0, 0, 0, 0.2],
1041 active_bg => [1, 1, 1, 0.5],
1042 active_fg => [0, 0, 0],
1043 can_hover => 1,
1044 can_focus => 1,
1045 @_
1046 )
1047}
1048
1049sub _set_text {
1050 my ($self, $text) = @_;
1051
1052 my $old_text = $self->{text};
1053
1054 $self->{last_activity} = $::NOW;
1055
1056 $self->{text} = $text;
1057 $self->{layout}->set_width ($self->{w});
1058 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1059
1060 $text =~ s/./*/g if $self->{hidden};
1061
1062 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1063
1064 $text = substr $text, 0, $self->{cursor};
1065 utf8::encode $text;
1066
1067 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1068
1069 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1070 if $old_text ne $self->{text};
1071}
1072
1073sub size_request {
1074 my ($self) = @_;
1075
1076 my ($w, $h) = $self->SUPER::size_request;
1077
1078 ($w + 1, $h) # add 1 for cursor
1079}
1080
1081sub size_allocate {
1082 my ($self, $x, $y, $w, $h) = @_;
1083
1084 $self->SUPER::size_allocate ($x, $y, $w, $h);
1085
1086 $self->_set_text ($self->{text});
1087}
1088
1089sub set_text {
1090 my ($self, $text) = @_;
1091
1092 $self->{cursor} = length $text;
1093 $self->_set_text ($text);
1094 $self->update;
1095}
1096
1097sub key_down {
1098 my ($self, $ev) = @_;
1099
1100 my $mod = $ev->key_mod;
1101 my $sym = $ev->key_sym;
1102
1103 my $uni = $ev->key_unicode;
1104
1105 my $text = $self->get_text;
1106
1107 if ($sym == SDLK_BACKSPACE) {
1108 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1109 } elsif ($sym == SDLK_DELETE) {
1110 substr $text, $self->{cursor}, 1, "";
1111 } elsif ($sym == SDLK_LEFT) {
1112 --$self->{cursor} if $self->{cursor};
1113 } elsif ($sym == SDLK_RIGHT) {
1114 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1115 } elsif ($sym == SDLK_HOME) {
1116 $self->{cursor} = 0;
1117 } elsif ($sym == SDLK_END) {
1118 $self->{cursor} = length $text;
1119 } elsif ($sym == SDLK_ESCAPE) {
1120 $self->emit ('escape');
1121 } elsif ($uni) {
1122 substr $text, $self->{cursor}++, 0, chr $uni;
1123 }
1124
1125 $self->_set_text ($text);
1126 $self->update;
1127}
1128
1129sub focus_in {
1130 my ($self) = @_;
1131
1132 $self->{last_activity} = $::NOW;
1133
1134 $self->SUPER::focus_in;
1135}
1136
1137sub button_down {
1138 my ($self, $ev, $x, $y) = @_;
1139
1140 $self->SUPER::button_down ($ev, $x, $y);
1141
1142 my $idx = $self->{layout}->xy_to_index ($x, $y);
1143
1144 # byte-index to char-index
1145 my $text = $self->{text};
1146 utf8::encode $text;
1147 $self->{cursor} = length substr $text, 0, $idx;
1148
1149 $self->_set_text ($self->{text});
1150 $self->update;
1151}
1152
1153sub mouse_motion {
1154 my ($self, $ev, $x, $y) = @_;
1155# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1156}
1157
1158sub _draw {
1159 my ($self) = @_;
1160
1161 local $self->{fg} = $self->{fg};
1162
1163 if ($FOCUS == $self) {
1164 glColor @{$self->{active_bg}};
1165 $self->{fg} = $self->{active_fg};
1166 } else {
1167 glColor @{$self->{bg}};
1168 }
1169
1170 glEnable GL_BLEND;
1171 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1172 glBegin GL_QUADS;
1173 glVertex 0 , 0;
1174 glVertex 0 , $self->{h};
1175 glVertex $self->{w}, $self->{h};
1176 glVertex $self->{w}, 0;
1177 glEnd;
1178 glDisable GL_BLEND;
1179
1180 $self->SUPER::_draw;
1181
1182 #TODO: force update every cursor change :(
1183 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1184 glColor @{$self->{fg}};
1185 glBegin GL_LINES;
1186 glVertex $self->{cur_x}, $self->{cur_y};
1187 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1188 glEnd;
1189 }
1190}
1191
1192package CFClient::UI::LineEntry;
1193
1194our @ISA = CFClient::UI::Entry::;
1195
1196use SDL;
1197use SDL::OpenGL;
1198
1199sub key_down {
1200 my ($self, $ev) = @_;
1201
1202 my $sym = $ev->key_sym;
1203
1204 if ($sym == SDLK_RETURN) {
1205 $self->emit (activate => $self->get_text);
1206 $self->update;
1207
1208 } else {
1209 $self->SUPER::key_down ($ev);
1210 }
1211
1212}
1213
1214#############################################################################
1215
1216package CFClient::UI::Button;
1217
1218our @ISA = CFClient::UI::Label::;
1219
1220use SDL;
1221use SDL::OpenGL;
1222
1223my @tex =
1224 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1225 qw(b1_button_active.png);
1226
1227sub new {
1228 my $class = shift;
1229
1230 $class->SUPER::new (
1231 padding => 4,
1232 fg => [1, 1, 1],
1233 bg => [1, 1, 1, 0.2],
1234 active_fg => [1, 1, 0],
1235 can_hover => 1,
1236 @_
1237 )
1238}
1239
1240sub button_up {
1241 my ($self, $ev, $x, $y) = @_;
1242
1243 if ($x >= 0 && $x < $self->{w}
1244 && $y >= 0 && $y < $self->{h}) {
1245 $self->emit ("activate");
1246 }
1247}
1248
1249sub _draw {
1250 my ($self) = @_;
1251
1252 local $self->{fg} = $self->{fg};
1253 my $tex = $tex[0];
748 1254
749 glEnable GL_BLEND; 1255 glEnable GL_BLEND;
750 glEnable GL_TEXTURE_2D; 1256 glEnable GL_TEXTURE_2D;
751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1257 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1258
1259 if ($GRAB == $self) {
1260 $self->{fg} = $self->{active_fg};
1261 }
1262
1263 glBindTexture GL_TEXTURE_2D, $tex->{name};
752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1264 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
753 1265
754 glColor @{$self->{color}}; 1266 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
755 1267
1268 glDisable GL_TEXTURE_2D;
1269 glDisable GL_BLEND;
1270
1271 $self->SUPER::_draw;
1272}
1273
1274#############################################################################
1275
1276package CFClient::UI::CheckBox;
1277
1278our @ISA = CFClient::UI::DrawBG::;
1279
1280my @tex =
1281 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1282 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1283
1284use SDL;
1285use SDL::OpenGL;
1286
1287sub new {
1288 my $class = shift;
1289
1290 $class->SUPER::new (
1291 padding => 2,
1292 fg => [1, 1, 1],
1293 active_fg => [1, 1, 0],
1294 state => 0,
1295 can_hover => 1,
1296 @_
1297 )
1298}
1299
1300sub size_request {
1301 my ($self) = @_;
1302
1303 ($self->{padding} * 2 + 6) x 2
1304}
1305
1306sub size_allocate {
1307 my ($self, $x, $y, $w, $h) = @_;
1308
1309 $self->_size_allocate ($x, $y, $w, $h);
1310}
1311
1312sub button_down {
1313 my ($self, $ev, $x, $y) = @_;
1314
1315 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1316 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1317 $self->{state} = !$self->{state};
1318 $self->emit (changed => $self->{state});
1319 }
1320}
1321
1322sub _draw {
1323 my ($self) = @_;
1324
1325 $self->SUPER::_draw;
1326
1327 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1328
1329 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1330
1331 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1332
1333 glEnable GL_BLEND;
1334 glEnable GL_TEXTURE_2D;
1335 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1336
1337 my $tex = $self->{state} ? $tex[1] : $tex[0];
1338
756 $tex->draw_quad (0, 0); 1339 $tex->draw_quad (0, 0, $s, $s);
1340
1341 glDisable GL_TEXTURE_2D;
1342 glDisable GL_BLEND;
1343}
1344
1345#############################################################################
1346
1347package CFClient::UI::Slider;
1348
1349use strict;
1350
1351use SDL::OpenGL;
1352
1353our @ISA = CFClient::UI::DrawBG::;
1354
1355my @tex =
1356 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1357 qw(s1_slider.png s1_slider_bg.png);
1358
1359sub new {
1360 my $class = shift;
1361
1362 # range [value, low, high, page]
1363
1364 # TODO: 0-width page
1365 # TODO: req_w/h are wrong with vertical
1366 # TODO: calculations are off
1367 my $self = $class->SUPER::new (
1368 fg => [1, 1, 1],
1369 active_fg => [0, 0, 0],
1370 range => [0, 0, 100, 10],
1371 req_w => 40,
1372 req_h => 13,
1373 vertical => 0,
1374 can_hover => 1,
1375 inner_pad => 5,
1376 @_
1377 );
1378
1379 $self
1380}
1381
1382sub size_request {
1383 my ($self) = @_;
1384
1385 my $w = $self->{req_w};
1386 my $h = $self->{req_h};
1387
1388 $self->{vertical} ? ($h, $w) : ($w, $h)
1389}
1390
1391sub button_down {
1392 my ($self, $ev, $x, $y) = @_;
1393
1394 $self->SUPER::button_down ($ev, $x, $y);
1395 $self->mouse_motion ($ev, $x, $y);
1396}
1397
1398sub mouse_motion {
1399 my ($self, $ev, $x, $y) = @_;
1400
1401 if ($GRAB == $self) {
1402 my ($value, $lo, $hi, $page) = @{$self->{range}};
1403
1404 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1405
1406 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1407 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1408
1409 $x -= $inner_pad_px; # substract the padding
1410 $x = $x * ($hi - $lo) / $inner_w + $lo;
1411 $x = $lo if $x < $lo;
1412 $x = $hi - $page if $x > $hi - $page;
1413 $self->{range}[0] = $x;
1414
1415 $self->emit (changed => $x);
1416 $self->update;
1417 }
1418}
1419
1420# the inner_* stuff is for generating a padding for the slider handle,
1421# so that the handle doesn't leave the texture. This calculation isn't 100%
1422# correct propably, but it does the job for now
1423sub _calc_inner_pad_px {
1424 my ($self, $w) = @_;
1425 ($w / 100) * $self->{inner_pad} # % to pixels
1426}
1427
1428sub _draw {
1429 my ($self) = @_;
1430
1431 $self->SUPER::_draw ();
1432
1433 my ($w, $h) = @$self{qw(w h)};
1434
1435 if ($self->{vertical}) {
1436 # draw a vertical slider like a rotated horizontal slider
1437
1438 glRotate 90, 0, 0, 1;
1439 glTranslate 0, -$self->{w}, 0;
1440
1441 ($w, $h) = ($h, $w);
1442 }
1443
1444 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1445 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1446
1447 my ($value, $lo, $hi, $page) = @{$self->{range}};
1448
1449 $hi = $value + 1 if $lo == $hi;
1450
1451 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1452 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1453
1454 $page = int $page * $inner_w / ($hi - $lo);
1455 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1456
1457 $w -= $page;
1458 $page &= ~1;
1459 glTranslate $page * 0.5, 0, 0;
1460 $page ||= 2;
1461
1462 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1463 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1464
1465 glEnable GL_BLEND;
1466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1467 glEnable GL_TEXTURE_2D;
1468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469
1470 # draw background
1471 $tex[1]->draw_quad (0, 0, $w, $h);
1472
1473 # draw handle
1474 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
757 1475
758 glDisable GL_BLEND; 1476 glDisable GL_BLEND;
759 glDisable GL_TEXTURE_2D; 1477 glDisable GL_TEXTURE_2D;
760} 1478}
761 1479
762############################################################################# 1480#############################################################################
763 1481
1482package CFClient::UI::TextView;
1483
1484our @ISA = CFClient::UI::HBox::;
1485
1486use SDL::OpenGL;
1487
1488sub new {
1489 my $class = shift;
1490
1491 my $self = $class->SUPER::new (
1492 req_w => $::WIDTH / 6,
1493 req_h => $::HEIGHT / 6,
1494 fontsize => $::FONTSIZE,
1495 @_,
1496
1497 layout => (new CFClient::Layout),
1498 par => [],
1499 height => 0,
1500 children => [
1501 (new CFClient::UI::Empty expand => 1),
1502 (new CFClient::UI::Slider vertical => 1),
1503 ],
1504 );
1505
1506 $self->{children}[1]->connect (changed => sub {
1507 $self->update;
1508 });
1509
1510 $self
1511}
1512
1513sub set_fontsize {
1514 my ($self, $fontsize) = @_;
1515
1516 $self->{fontsize} = $fontsize;
1517 $self->reflow;
1518}
1519
1520sub text_height {
1521 my ($self, $text) = @_;
1522
1523 my $layout = $self->{layout};
1524
1525 $layout->set_height ($self->{fontsize});
1526 $layout->set_width ($self->{w});
1527 $layout->set_text ($text);
1528
1529 ($layout->size)[1]
1530}
1531
1532sub reflow {
1533 my ($self) = @_;
1534
1535 $self->{need_reflow}++;
1536 $self->update;
1537}
1538
1539sub size_request {
1540 my ($self) = @_;
1541
1542 ($self->{req_w}, $self->{req_h})
1543}
1544
1545sub size_allocate {
1546 my ($self, $x, $y, $w, $h) = @_;
1547
1548 $self->SUPER::size_allocate ($x, $y, $w, $h);
1549
1550 $self->{layout}->set_height ($self->{fontsize});
1551 $self->{layout}->set_width ($self->{w});
1552
1553 $self->reflow;
1554}
1555
1556sub add_paragraph {
1557 my ($self, $color, $text) = @_;
1558
1559 #TODO: intelligently "reformat" paragraph
1560
1561 my $height = $self->text_height ($text);
1562
1563 $self->{height} += $height;
1564
1565 push @{$self->{par}}, [$height, $color, $text];
1566
1567 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1568 $self->{children}[1]->update;
1569}
1570
1571sub update {
1572 my ($self) = @_;
1573
1574 $self->SUPER::update;
1575
1576 return unless $self->{h} > 0;
1577
1578 delete $self->{texture};
1579
1580 $TOPLEVEL->on_refresh ($self, sub {
1581 if (delete $self->{need_reflow}) {
1582 my $height = 0;
1583
1584 $height += $_->[0] = $self->text_height ($_->[2])
1585 for @{$self->{par}};
1586
1587 $self->{height} = $height;
1588
1589 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1590
1591 delete $self->{texture};
1592 }
1593
1594 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1595 glClearColor 0, 0, 0, 1;
1596 glClear GL_COLOR_BUFFER_BIT;
1597
1598 glEnable GL_BLEND;
1599 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1600 glEnable GL_TEXTURE_2D;
1601 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1602
1603 my $top = int $self->{children}[1]{range}[0];
1604
1605 my $y0 = $top;
1606 my $y1 = $top + $self->{h};
1607
1608 my $y = 0;
1609
1610 my $layout = $self->{layout};
1611
1612 for my $par (@{$self->{par}}) {
1613 my $h = $par->[0];
1614
1615 if ($y0 < $y + $h && $y < $y1) {
1616 $layout->set_text ($par->[2]);
1617
1618 glColor @{ $par->[1] };
1619 my ($W, $H) = $layout->size;
1620 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1621 }
1622
1623 $y += $h;
1624 }
1625
1626 glDisable GL_TEXTURE_2D;
1627 glDisable GL_BLEND;
1628 };
1629 });
1630}
1631
1632sub _draw {
1633 my ($self) = @_;
1634
1635 if ($self->{texture}) {
1636 glEnable GL_TEXTURE_2D;
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1638 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1639 glDisable GL_TEXTURE_2D;
1640 }
1641
1642 $self->{children}[1]->draw;
1643
1644}
1645
1646#############################################################################
1647
764package CFClient::Widget::Entry; 1648package CFClient::UI::MapWidget;
765 1649
766our @ISA = CFClient::Widget::Label::; 1650use strict;
1651
1652use List::Util qw(min max);
767 1653
768use SDL; 1654use SDL;
769use SDL::OpenGL; 1655use SDL::OpenGL;
770 1656
1657our @ISA = CFClient::UI::Base::;
1658
1659sub new {
1660 my $class = shift;
1661
1662 $class->SUPER::new (
1663 z => -1,
1664 can_focus => 1,
1665 list => (glGenLists 1),
1666 @_
1667 )
1668}
1669
771sub key_down { 1670sub key_down {
772 my ($self, $ev) = @_; 1671 print "MAPKEYDOWN\n";
1672}
773 1673
774 my $mod = $ev->key_mod; 1674sub key_up {
775 my $sym = $ev->key_sym;
776
777 my $uni = $ev->key_unicode;
778
779 my $text = $self->get_text;
780
781 if ($sym == SDLK_BACKSPACE) {
782 substr $text, -1, 1, '';
783 } elsif ($uni) {
784 $text .= chr $uni;
785 }
786
787 $self->set_text ($text);
788} 1675}
789 1676
790sub button_down { 1677sub button_down {
791 my ($self, $ev) = @_; 1678 my ($self, $ev, $x, $y) = @_;
792 1679
793 $self->focus_in; 1680 $self->focus_in;
1681
1682 if ($ev->button == 2) {
1683 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1684 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1685
1686 $self->{motion} = sub {
1687 my ($ev, $x, $y) = @_;
1688
1689 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1690
1691 $::CFG->{map_shift_x} = $bw + $x - $ox;
1692 $::CFG->{map_shift_y} = $bh + $y - $oy;
1693
1694 $self->update;
1695 };
1696 }
1697}
1698
1699sub button_up {
1700 my ($self, $ev, $x, $y) = @_;
1701
1702 delete $self->{motion};
794} 1703}
795 1704
796sub mouse_motion { 1705sub mouse_motion {
797 my ($self, $ev, $x, $y) = @_; 1706 my ($self, $ev, $x, $y) = @_;
798 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
799}
800 1707
801sub _draw { 1708 $self->{motion}->($ev, $x, $y) if $self->{motion};
802 my ($self) = @_;
803
804 if ($FOCUS == $self) {
805 glColor 1, 1, 1;
806 } else {
807 glColor 0.7, 0.7, 0.7;
808 }
809
810 glBegin GL_QUADS;
811 glVertex 0 , 0;
812 glVertex 0 , $self->{h} - 1;
813 glVertex $self->{w} - 1, $self->{h} - 1;
814 glVertex $self->{w} - 1, 0;
815 glEnd;
816
817 $self->SUPER::_draw;
818}
819
820#############################################################################
821
822package CFClient::Widget::MapWidget;
823
824use strict;
825
826use List::Util qw(min max);
827
828use SDL;
829use SDL::OpenGL;
830use SDL::OpenGL::Constants;
831
832our @ISA = CFClient::Widget::;
833
834sub new {
835 my $class = shift;
836
837 $class->SUPER::new (
838 z => -1,
839 list => (glGenLists 1),
840 @_
841 )
842}
843
844sub key_down {
845 print "MAPKEYDOWN\n";
846}
847
848sub key_up {
849} 1709}
850 1710
851sub size_request { 1711sub size_request {
852 ( 1712 (
853 1 + int $::WIDTH / 32, 1713 1 + 32 * int $::WIDTH / 32,
854 1 + int $::HEIGHT / 32, 1714 1 + 32 * int $::HEIGHT / 32,
855 ) 1715 )
856} 1716}
857 1717
858sub update { 1718sub update {
859 my ($self) = @_; 1719 my ($self) = @_;
860 1720
861 $self->{need_update} = 1; 1721 $self->{need_update} = 1;
1722 $self->SUPER::update;
862} 1723}
863 1724
864sub _draw { 1725sub draw {
865 my ($self) = @_; 1726 my ($self) = @_;
866 1727
867 if (delete $self->{need_update}) { 1728 if (delete $self->{need_update}) {
868 glNewList $self->{list}, GL_COMPILE; 1729 glNewList $self->{list}, GL_COMPILE;
869 1730
870 my $mx = $::CONN->{mapx}; 1731 if ($::MAP) {
871 my $my = $::CONN->{mapy};
872
873 my $map = $::CONN->{map};
874
875 my ($xofs, $yofs);
876
877 my $sw = 1 + int $::WIDTH / 32; 1732 my $sw = int $::WIDTH / 32;
878 my $sh = 1 + int $::HEIGHT / 32; 1733 my $sh = int $::HEIGHT / 32;
879 1734
880 if ($::CONN->{mapw} > $sw) { 1735 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
881 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1736 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
882 } else { 1737
883 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1738 glTranslate $sx0 - 32, $sy0 - 32, 0;
1739
1740 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1741
1742 if ($::CFG->{fow_enable}) {
1743 if ($::CFG->{fow_smooth}) { # smooth fog of war
1744 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1745 glConvolutionFilter2D
1746 GL_CONVOLUTION_2D,
1747 GL_ALPHA,
1748 3, 3,
1749 GL_ALPHA, GL_FLOAT,
1750 pack "f*",
1751 0.1, 0.1, 0.1,
1752 0.1, 0.2, 0.1,
1753 0.1, 0.1, 0.1,
1754 ;
1755 glEnable GL_CONVOLUTION_2D;
1756 }
1757
1758 my $tex = new CFClient::Texture
1759 w => $w,
1760 h => $h,
1761 data => $data,
1762 internalformat => GL_ALPHA,
1763 format => GL_ALPHA;
1764
1765 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1766
1767 glEnable GL_BLEND;
1768 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1769 glEnable GL_TEXTURE_2D;
1770 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1771
1772 glColor +($::CFG->{fow_intensity}) x 3, 1;
1773 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1774
1775 glDisable GL_TEXTURE_2D;
1776 glDisable GL_BLEND;
1777 }
1778
1779 # HACK BEGIN
1780 {
1781 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1782 my ($w, $h) = (250, 250);
1783
1784 glEnable GL_BLEND;
1785 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1786 glEnable GL_TEXTURE_2D;
1787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1788
1789 CFClient::Texture->new (
1790 w => $w,
1791 h => $h,
1792 data => $::MAP->mapmap ($w, $h),
1793 type => GL_UNSIGNED_INT_8_8_8_8_REV
1794 )->draw_quad (100, 100);
1795
1796 glDisable GL_TEXTURE_2D;
1797 glDisable GL_BLEND;
1798 }
1799 # HACK END
884 } 1800 }
885 1801
886 if ($::CONN->{maph} > $sh) {
887 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
888 } else {
889 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
890 }
891
892 glEnable GL_TEXTURE_2D;
893 glEnable GL_BLEND;
894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
895
896 my $sw4 = ($sw + 3) & ~3;
897 my $darkness = "\x00" x ($sw4 * $sh);
898
899 for my $x (0 .. $sw - 1) {
900 my $row = $map->[$x + $xofs];
901 for my $y (0 .. $sh - 1) {
902
903 my $cell = $row->[$y + $yofs]
904 or next;
905
906 my $dark = $cell->[0];
907 if ($dark < 0) {
908 substr $darkness, $y * $sw4 + $x, 1, chr 224;
909 } else {
910 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
911 }
912
913 for my $num (grep $_, @$cell[1,2,3]) {
914 my $tex = $::CONN->{face}[$num]{texture} || next;
915
916 my $w = $tex->{width};
917 my $h = $tex->{height};
918
919 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
920 }
921 }
922 }
923
924# if (1) { # higher quality darkness
925# $lighting =~ s/(.)/$1$1$1/gs;
926# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
927#
928# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
929#
930# $lighting = $pb->get_pixels;
931# $lighting =~ s/(.)../$1/gs;
932# }
933
934 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
936
937 $darkness = new CFClient::Texture
938 width => $sw4,
939 height => $sh,
940 data => $darkness,
941 internalformat => GL_ALPHA,
942 format => GL_ALPHA;
943
944 glColor 0.45, 0.45, 0.45, 1;
945 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
946
947 glDisable GL_TEXTURE_2D;
948 glDisable GL_BLEND;
949
950 glEndList; 1802 glEndList;
951 } 1803 }
952 1804
1805 glPushMatrix;
953 glCallList $self->{list}; 1806 glCallList $self->{list};
1807 glPopMatrix;
1808
1809 if ($FOCUS != $self) {
1810 glColor 64/255, 64/255, 64/255;
1811 glLogicOp GL_AND;
1812 glEnable GL_COLOR_LOGIC_OP;
1813 glBegin GL_QUADS;
1814 glVertex 0, 0;
1815 glVertex 0, $::HEIGHT;
1816 glVertex $::WIDTH, $::HEIGHT;
1817 glVertex $::WIDTH, 0;
1818 glEnd;
1819 glDisable GL_COLOR_LOGIC_OP;
1820 }
954} 1821}
955 1822
956my %DIR = ( 1823my %DIR = (
957 SDLK_KP8, [1, "north"], 1824 SDLK_KP8, [1, "north"],
958 SDLK_KP9, [2, "northeast"], 1825 SDLK_KP9, [2, "northeast"],
… …
974 1841
975 my $mod = $ev->key_mod; 1842 my $mod = $ev->key_mod;
976 my $sym = $ev->key_sym; 1843 my $sym = $ev->key_sym;
977 1844
978 if ($sym == SDLK_KP5) { 1845 if ($sym == SDLK_KP5) {
979 $::CONN->send ("command stay fire"); 1846 $::CONN->user_send ("command stay fire");
1847 } elsif ($sym == SDLK_a) {
1848 $::CONN->user_send ("command apply");
1849 } elsif ($sym == SDLK_QUOTE) {
1850 $self->emit ('activate_console');
1851 } elsif ($sym == SDLK_SLASH) {
1852 $self->emit ('activate_console' => '/');
980 } elsif (exists $DIR{$sym}) { 1853 } elsif (exists $DIR{$sym}) {
981 if ($mod & KMOD_SHIFT) { 1854 if ($mod & KMOD_SHIFT) {
982 $self->{shft}++; 1855 $self->{shft}++;
983 $::CONN->send ("command fire $DIR{$sym}[0]"); 1856 $::CONN->user_send ("command fire $DIR{$sym}[0]");
984 } elsif ($mod & KMOD_CTRL) { 1857 } elsif ($mod & KMOD_CTRL) {
985 $self->{ctrl}++; 1858 $self->{ctrl}++;
986 $::CONN->send ("command run $DIR{$sym}[0]"); 1859 $::CONN->user_send ("command run $DIR{$sym}[0]");
987 } else { 1860 } else {
988 $::CONN->send ("command $DIR{$sym}[1]"); 1861 $::CONN->user_send ("command $DIR{$sym}[1]");
989 } 1862 }
990 } 1863 }
991} 1864}
992 1865
993sub key_up { 1866sub key_up {
… …
995 1868
996 my $mod = $ev->key_mod; 1869 my $mod = $ev->key_mod;
997 my $sym = $ev->key_sym; 1870 my $sym = $ev->key_sym;
998 1871
999 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1872 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1000 $::CONN->send ("command fire_stop"); 1873 $::CONN->user_send ("command fire_stop");
1001 } 1874 }
1002 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1875 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1003 $::CONN->send ("command run_stop"); 1876 $::CONN->user_send ("command run_stop");
1004 } 1877 }
1005} 1878}
1006 1879
1007############################################################################# 1880#############################################################################
1008 1881
1009package CFClient::Widget::Animator; 1882package CFClient::UI::Animator;
1010 1883
1011use SDL::OpenGL; 1884use SDL::OpenGL;
1012 1885
1013our @ISA = CFClient::Widget::Bin::; 1886our @ISA = CFClient::UI::Bin::;
1014 1887
1015sub moveto { 1888sub moveto {
1016 my ($self, $x, $y) = @_; 1889 my ($self, $x, $y) = @_;
1017 1890
1018 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1891 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
1046 glPopMatrix; 1919 glPopMatrix;
1047} 1920}
1048 1921
1049############################################################################# 1922#############################################################################
1050 1923
1924package CFClient::UI::Flopper;
1925
1926our @ISA = CFClient::UI::Button::;
1927
1928sub new {
1929 my $class = shift;
1930
1931 my $self = $class->SUPER::new (
1932 state => 0,
1933 connect_activate => \&toggle_flopper,
1934 @_
1935 );
1936
1937 if ($self->{state}) {
1938 $self->{state} = 0;
1939 $self->toggle_flopper;
1940 }
1941
1942 $self
1943}
1944
1945sub toggle_flopper {
1946 my ($self) = @_;
1947
1948 # TODO: use animation
1949 if ($self->{state} = !$self->{state}) {
1950 $CFClient::UI::TOPLEVEL->add ($self->{other});
1951 $self->{other}->move (
1952 ($::WIDTH - $self->{other}{w}) * 0.5,
1953 ($::HEIGHT - $self->{other}{h}) * 0.5,
1954 );
1955 } else {
1956 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1957 }
1958}
1959
1960#############################################################################
1961
1051package CFClient::Widget::Toplevel; 1962package CFClient::UI::Toplevel;
1052 1963
1053our @ISA = CFClient::Widget::Container::; 1964our @ISA = CFClient::UI::Container::;
1965
1966use SDL::OpenGL;
1054 1967
1055sub size_request { 1968sub size_request {
1056 ($::WIDTH, $::HEIGHT) 1969 ($::WIDTH, $::HEIGHT)
1057} 1970}
1058 1971
1059sub size_allocate { 1972sub size_allocate {
1060 my ($self, $w, $h) = @_; 1973 my ($self, $x, $y, $w, $h) = @_;
1061 1974
1062 $self->SUPER::size_allocate ($w, $h); 1975 $self->_size_allocate ($x, $y, $w, $h);
1063 1976
1064 $_->size_allocate ($_->size_request) 1977 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1065 for @{$self->{children}}; 1978 for @{$self->{children}};
1066} 1979}
1067 1980
1068sub translate { 1981sub translate {
1069 my ($self, $x, $y) = @_; 1982 my ($self, $x, $y) = @_;
… …
1072} 1985}
1073 1986
1074sub update { 1987sub update {
1075 my ($self) = @_; 1988 my ($self) = @_;
1076 1989
1077 $self->size_allocate ($self->size_request); 1990 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1078 ::refresh (); 1991 ::refresh ();
1079} 1992}
1080 1993
1081sub add { 1994sub add {
1082 my ($self, $widget) = @_; 1995 my ($self, $widget) = @_;
1083 1996
1084 $self->SUPER::add ($widget); 1997 $self->SUPER::add ($widget);
1085 1998
1086 $widget->size_allocate ($widget->size_request); 1999 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
2000}
2001
2002sub on_refresh {
2003 my ($self, $id, $cb) = @_;
2004
2005 $self->{refresh_hook}{$id} = $cb;
1087} 2006}
1088 2007
1089sub draw { 2008sub draw {
1090 my ($self) = @_; 2009 my ($self) = @_;
1091 2010
2011 while (my $rcb = delete $self->{refresh_hook}) {
2012 $_->() for values %$rcb;
2013 }
2014
2015 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2016 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2017 glClear GL_COLOR_BUFFER_BIT;
2018
2019 glMatrixMode GL_PROJECTION;
2020 glLoadIdentity;
2021 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2022 glMatrixMode GL_MODELVIEW;
2023 glLoadIdentity;
2024
1092 $self->_draw; 2025 $self->_draw;
1093} 2026}
1094 2027
1095############################################################################# 2028#############################################################################
1096 2029
1097package CFClient::Widget; 2030package CFClient::UI;
1098 2031
1099$TOPLEVEL = new CFClient::Widget::Toplevel; 2032$TOPLEVEL = new CFClient::UI::Toplevel;
1100 2033
11011 20341
1102 2035

Diff Legend

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