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.30 by root, Sun Apr 9 00:18:45 2006 UTC vs.
Revision 1.66 by root, Tue Apr 11 14:36:02 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use CFClient;
11our @ACTIVE_WIDGETS; 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
12 16
13# class methods for events 17# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 20}
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
18 74
19sub new { 75sub new {
20 my $class = shift; 76 my $class = shift;
21 77
22 bless { @_ }, $class 78 bless {
23} 79 x => 0,
24 80 y => 0,
25sub activate { 81 z => 0,
26 push @ACTIVE_WIDGETS, $_[0]; 82 @_
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1]; 83 }, $class
28}
29
30sub deactivate {
31 @ACTIVE_WIDGETS =
32 sort { $a->{z} <=> $b->{z} }
33 grep { $_ && $_ != $_[0] }
34 @ACTIVE_WIDGETS;
35} 84}
36 85
37sub move { 86sub move {
38 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 88 $self->{x} = $x;
… …
44sub needs_redraw { 93sub needs_redraw {
45 0 94 0
46} 95}
47 96
48sub size_request { 97sub size_request {
98 require Carp;
49 die "size_request is abtract"; 99 Carp::confess "size_request is abtract";
100}
101
102sub size_allocate {
103 my ($self, $w, $h) = @_;
104
105 $self->{w} = $w;
106 $self->{h} = $h;
107}
108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
50} 114}
51 115
52sub focus_in { 116sub focus_in {
53 my ($widget) = @_; 117 my ($self) = @_;
54 $FOCUS = $widget; 118
119 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus;
121 $FOCUS->update;
55} 122}
56 123
57sub focus_out { 124sub focus_out {
58 my ($widget) = @_; 125 my ($self) = @_;
59}
60 126
61sub key_down { 127 return unless $FOCUS == $self;
62 my ($widget, $sdlev) = @_;
63}
64 128
65sub key_up { 129 my $focus = $FOCUS; undef $FOCUS;
66 my ($widget, $sdlev) = @_; 130 $focus->update if $focus; #?
67} 131}
68 132
133sub mouse_motion { }
134sub button_up { }
69sub button_down { 135sub button_down { }
70 my ($widget, $sdlev) = @_; 136sub key_down { }
71} 137sub key_up { }
72 138
73sub button_up { 139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
74 my ($widget, $sdlev) = @_; 140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
75}
76
77sub w { $_[0]->{w} }
78sub h { $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
82 144
83sub draw { 145sub draw {
84 my ($self) = @_; 146 my ($self) = @_;
85 147
86 glPushMatrix; 148 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 149 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 150 $self->_draw;
151 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4;
153 glEnable GL_BLEND;
154 glBegin GL_QUADS;
155 glVertex 0 , 0;
156 glVertex $self->{w}, 0;
157 glVertex $self->{w}, $self->{h};
158 glVertex 0 , $self->{h};
159 glEnd;
160 glDisable GL_BLEND;
161 }
89 glPopMatrix; 162 glPopMatrix;
90} 163}
91 164
92sub _draw { 165sub _draw {
93 my ($widget) = @_; 166 my ($self) = @_;
167
168 warn "no draw defined for $self\n";
94} 169}
95 170
96sub bbox { 171sub bbox {
97 my ($widget) = @_; 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}
181
182sub find_widget {
183 my ($self, $x, $y) = @_;
184
185 return $self
186 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188
189 ()
190}
191
192sub del_parent { $_[0]->{parent} = undef }
193
194sub set_parent {
195 my ($self, $par) = @_;
196
197 $self->{parent} = $par;
198 Scalar::Util::weaken $self->{parent};
199}
200
201sub get_parent {
202 $_[0]->{parent}
203}
204
205sub update {
206 my ($self) = @_;
207
208 $self->{parent}->update
209 if $self->{parent};
98} 210}
99 211
100sub DESTROY { 212sub DESTROY {
101 my ($self) = @_; 213 my ($self) = @_;
102 214
103 $self->deactivate; 215 #$self->deactivate;
104} 216}
105 217
218#############################################################################
219
220package CFClient::Widget::Empty;
221
222our @ISA = CFClient::Widget::;
223
224sub size_request {
225 (0, 0)
226}
227
228sub draw {
229}
230
231#############################################################################
232
106package Crossfire::Client::Widget::Container; 233package CFClient::Widget::Container;
107 234
108our @ISA = Crossfire::Client::Widget::; 235our @ISA = CFClient::Widget::;
236
237sub new {
238 my ($class, %arg) = @_;
239
240 my $children = delete $arg{children} || [];
241
242 my $self = $class->SUPER::new (children => [], %arg);
243 $self->add ($_) for @$children;
244
245 $self
246}
247
248sub add {
249 my ($self, $chld, $expand) = @_;
250
251 $chld->{expand} = $expand;
252 $chld->set_parent ($self);
253
254 $self->{children} = [
255 sort { $a->{z} <=> $b->{z} }
256 @{$self->{children}}, $chld
257 ];
258
259 $self->size_allocate ($self->{w}, $self->{h})
260 if $self->{w}; #TODO: check for "realised state"
261}
262
263sub remove {
264 my ($self, $widget) = @_;
265
266 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
267
268 $self->size_allocate ($self->{w}, $self->{h});
269}
270
271sub find_widget {
272 my ($self, $x, $y) = @_;
273
274 $x -= $self->{x};
275 $y -= $self->{y};
276
277 my $res;
278
279 for (reverse @{ $self->{children} }) {
280 $res = $_->find_widget ($x, $y)
281 and return $res;
282 }
283
284 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
285}
286
287sub _draw {
288 my ($self) = @_;
289
290 $_->draw for @{$self->{children}};
291}
292
293#############################################################################
294
295package CFClient::Widget::Bin;
296
297our @ISA = CFClient::Widget::Container::;
298
299sub new {
300 my ($class, %arg) = @_;
301
302 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
303
304 $class->SUPER::new (children => [$child], %arg)
305}
306
307sub add {
308 my ($self, $widget) = @_;
309
310 $self->{children} = [];
311
312 $self->SUPER::add ($widget);
313}
314
315sub remove {
316 my ($self, $widget) = @_;
317
318 $self->SUPER::remove ($widget);
319
320 $self->{children} = [new CFClient::Widget::Empty]
321 unless @{$self->{children}};
322}
323
324sub child { $_[0]->{children}[0] }
325
326sub size_request {
327 $_[0]{children}[0]->size_request if $_[0]{children}[0];
328}
329
330sub size_allocate {
331 my ($self, $w, $h) = @_;
332
333 $self->SUPER::size_allocate ($w, $h);
334 $self->{children}[0]->size_allocate ($w, $h)
335 if $self->{children}[0]
336}
337
338#############################################################################
339
340package CFClient::Widget::Window;
341
342our @ISA = CFClient::Widget::Bin::;
109 343
110use SDL::OpenGL; 344use SDL::OpenGL;
111 345
112sub add { $_[0]->{child} = $_[1] } 346sub new {
113sub get { $_[0]->{child} } 347 my ($class, %arg) = @_;
114 348
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 349 my $self = $class->SUPER::new (%arg);
350}
116 351
117sub _draw { die "Containers can't be drawn!" } 352sub update {
118
119package Crossfire::Client::Widget::Window;
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_; 353 my ($self) = @_;
127 $self->SUPER::add ($chld); 354
128 $self->render_chld; #TODO: Move this to the size_request event propably? 355 # we want to do this delayed...
356 $self->render_chld;
357 $self->SUPER::update;
129} 358}
130 359
131sub render_chld { 360sub render_chld {
132 my ($self) = @_; 361 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135 362
136 $self->{texture} = 363 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 364 CFClient::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 365 $self->{w}, $self->{h}, sub { $self->child->draw }
139 ); 366 );
140 $self->{texture}->upload;
141} 367}
142 368
143sub size_request { 369sub size_allocate {
144 my ($self) = @_; 370 my ($self, $w, $h) = @_;
145 my $chld = $self->get 371
146 or return (0, 0); 372 $self->{w} = $w;
147 $chld->size_request 373 $self->{h} = $h;
374
375 $self->child->size_allocate ($w, $h);
376
377 $self->render_chld;
148} 378}
149 379
150sub _draw { 380sub _draw {
151 my ($self) = @_; 381 my ($self) = @_;
152 382
153 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 383 my ($w, $h) = ($self->w, $self->h);
154 384
155 my $tex = $self->{texture} 385 my $tex = $self->{texture}
156 or return; 386 or return;
157 387
158 glEnable GL_BLEND; 388 glEnable GL_BLEND;
159 glEnable GL_TEXTURE_2D; 389 glEnable GL_TEXTURE_2D;
160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 390 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
161 glBindTexture GL_TEXTURE_2D, $tex->{name};
162 391
163 glColor 1, 1, 1; 392 $tex->draw_quad (0, 0, $w, $h);
164
165 glBegin GL_QUADS;
166 glTexCoord 0, 0; glVertex 0, 0;
167 glTexCoord 0, 1; glVertex 0, $h;
168 glTexCoord 1, 1; glVertex $w, $h;
169 glTexCoord 1, 0; glVertex $w, 0;
170 glEnd;
171 393
172 glDisable GL_BLEND; 394 glDisable GL_BLEND;
173 glDisable GL_TEXTURE_2D; 395 glDisable GL_TEXTURE_2D;
174} 396}
175 397
398#############################################################################
399
176package Crossfire::Client::Widget::Frame; 400package CFClient::Widget::Frame;
177 401
178our @ISA = Crossfire::Client::Widget::Container::; 402our @ISA = CFClient::Widget::Bin::;
179 403
180use SDL::OpenGL; 404use SDL::OpenGL;
181 405
182sub size_request { 406sub size_request {
183 my ($self) = @_; 407 my ($self) = @_;
184 my $chld = $self->get 408 my $chld = $self->child
185 or return (0, 0); 409 or return (0, 0);
186 410
187 $chld->move (2, 2); 411 $chld->move (2, 2);
188 412
189 map { $_ + 4 } $chld->size_request; 413 map { $_ + 4 } $chld->size_request;
190} 414}
191 415
416sub size_allocate {
417 my ($self, $w, $h) = @_;
418
419 $self->{w} = $w;
420 $self->{h} = $h;
421
422 $self->child->size_allocate ($w - 4, $h - 4);
423 $self->child->move (2, 2);
424}
425
192sub _draw { 426sub _draw {
193 my ($self) = @_; 427 my ($self) = @_;
194 428
195 my $chld = $self->get; 429 my $chld = $self->child;
196 430
197 my ($w, $h) = $chld->size_request; 431 my ($w, $h) = $chld->size_request;
198 432
199 glBegin GL_QUADS; 433 glBegin GL_QUADS;
200 glColor 0, 0, 0; 434 glColor 0, 0, 0;
201 glTexCoord 0, 0; glVertex 0 , 0; 435 glVertex 0 , 0;
202 glTexCoord 0, 1; glVertex 0 , $h + 4; 436 glVertex 0 , $h + 4;
203 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 437 glVertex $w + 4 , $h + 4;
204 glTexCoord 1, 0; glVertex $w + 4 , 0; 438 glVertex $w + 4 , 0;
205 glEnd; 439 glEnd;
206 440
207 $chld->draw; 441 $chld->draw;
208} 442}
209 443
444#############################################################################
445
446package CFClient::Widget::FancyFrame;
447
448our @ISA = CFClient::Widget::Bin::;
449
450use SDL::OpenGL;
451
452my @tex =
453 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);
455
456sub size_request {
457 my ($self) = @_;
458
459 my ($w, $h) = $self->SUPER::size_request;
460
461 $h += $tex[1]->{height};
462 $h += $tex[4]->{height};
463 $w += $tex[2]->{width};
464 $w += $tex[3]->{width};
465
466 ($w, $h)
467}
468
469sub size_allocate {
470 my ($self, $w, $h) = @_;
471
472 $self->SUPER::size_allocate ($w, $h);
473
474 $h -= $tex[1]->{height};
475 $h -= $tex[4]->{height};
476 $w -= $tex[2]->{width};
477 $w -= $tex[3]->{width};
478
479 $h = $h < 0 ? 0 : $h;
480 $w = $w < 0 ? 0 : $w;
481
482 my $child = $self->child;
483
484 $child->size_allocate ($w, $h);
485 $child->move ($tex[3]->{width}, $tex[1]->{height});
486}
487
488sub _draw {
489 my ($self) = @_;
490
491 my ($w, $h) = ($self->{w}, $self->{h});
492 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
493
494 glEnable GL_BLEND;
495 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;
498
499 my $top = $tex[1];
500 $top->draw_quad (0, 0, $w, $top->{height});
501
502 my $left = $tex[3];
503 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
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
511 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
517 my $rep_x = $cw / $bg->{width};
518 my $rep_y = $ch / $bg->{height};
519
520 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
521
522 glDisable GL_BLEND;
523 glDisable GL_TEXTURE_2D;
524
525 $self->child->draw;
526
527}
528
529#############################################################################
530
210package Crossfire::Client::Widget::Table; 531package CFClient::Widget::Table;
211 532
212our @ISA = Crossfire::Client::Widget::Container::; 533our @ISA = CFClient::Widget::Bin::;
213 534
214use SDL::OpenGL; 535use SDL::OpenGL;
215 536
216sub add { 537sub add {
217 my ($self, $x, $y, $chld) = @_; 538 my ($self, $x, $y, $chld) = @_;
539 my $old_chld = $self->{children}[$y][$x];
540
218 $self->{childs}[$y][$x] = $chld; 541 $self->{children}[$y][$x] = $chld;
542 $chld->set_parent ($self);
543 $self->update;
219} 544}
220 545
221sub max_row_height { 546sub max_row_height {
222 my ($self, $row) = @_; 547 my ($self, $row) = @_;
223 548
224 my $hs = 0; 549 my $hs = 0;
225 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 550 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
226 my $c = $self->{childs}->[$row]->[$xi]; 551 my $c = $self->{children}->[$row]->[$xi];
227 if ($c) { 552 if ($c) {
228 my ($w, $h) = $c->size_request; 553 my ($w, $h) = $c->size_request;
229 if ($hs < $h) { $hs = $h } 554 if ($hs < $h) { $hs = $h }
230 } 555 }
231 } 556 }
… …
234 559
235sub max_col_width { 560sub max_col_width {
236 my ($self, $col) = @_; 561 my ($self, $col) = @_;
237 562
238 my $ws = 0; 563 my $ws = 0;
239 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 564 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
240 my $c = ($self->{childs}->[$yi] || [])->[$col]; 565 my $c = ($self->{children}->[$yi] || [])->[$col];
241 if ($c) { 566 if ($c) {
242 my ($w, $h) = $c->size_request; 567 my ($w, $h) = $c->size_request;
243 if ($ws < $w) { $ws = $w } 568 if ($ws < $w) { $ws = $w }
244 } 569 }
245 } 570 }
… …
249sub size_request { 574sub size_request {
250 my ($self) = @_; 575 my ($self) = @_;
251 576
252 my ($hs, $ws) = (0, 0); 577 my ($hs, $ws) = (0, 0);
253 578
254 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 579 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
255 $hs += $self->max_row_height ($yi); 580 $hs += $self->max_row_height ($yi);
256 } 581 }
257 582
258 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 583 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
259 my $wm = 0; 584 my $wm = 0;
260 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 585 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
261 $wm += $self->max_col_width ($xi) 586 $wm += $self->max_col_width ($xi)
262 } 587 }
263 if ($ws < $wm) { $ws = $wm } 588 if ($ws < $wm) { $ws = $wm }
264 } 589 }
265 590
… …
268 593
269sub _draw { 594sub _draw {
270 my ($self) = @_; 595 my ($self) = @_;
271 596
272 my $y = 0; 597 my $y = 0;
273 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 598 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
274 my $x = 0; 599 my $x = 0;
275 600
276 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 601 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
277 602
278 my $c = $self->{childs}->[$yi]->[$xi]; 603 my $c = $self->{children}->[$yi]->[$xi];
279 if ($c) { 604 if ($c) {
280 $c->move ($x, $y, 0); #TODO: Move to size_request 605 $c->move ($x, $y, 0); #TODO: Move to size_request
281 $c->draw if $c; 606 $c->draw if $c;
282 } 607 }
283 608
… …
286 611
287 $y += $self->max_row_height ($yi); 612 $y += $self->max_row_height ($yi);
288 } 613 }
289} 614}
290 615
616#############################################################################
617
291package Crossfire::Client::Widget::VBox; 618package CFClient::Widget::VBox;
292 619
293our @ISA = Crossfire::Client::Widget::Container::; 620our @ISA = CFClient::Widget::Container::;
294 621
295use SDL::OpenGL; 622use SDL::OpenGL;
296 623
297sub add {
298 my ($self, $chld) = @_;
299 push @{$self->{childs}}, $chld;
300}
301
302sub size_request { 624sub size_request {
303 my ($self) = @_; 625 my ($self) = @_;
304 626
305 my ($hs, $ws) = (0, 0); 627 my @alloc = map [$_->size_request], @{$self->{children}};
628
629 (
630 (List::Util::max map $_->[0], @alloc),
631 (List::Util::sum map $_->[1], @alloc),
632 )
633}
634
635sub size_allocate {
636 my ($self, $w, $h) = @_;
637
638 $self->w ($w);
639 $self->h ($h);
640
641 my $exp;
642 my @oth;
643 # find expand widget
306 for (@{$self->{childs} || []}) { 644 for (@{$self->{children}}) {
645 if ($_->{expand}) {
646 $exp = $_;
647 last;
648 }
649 push @oth, $_;
650 }
651
652 my ($ow, $oh);
653
654 # get sizes of other widgets
655 for (@oth) {
307 my ($w, $h) = $_->size_request; 656 my ($w, $h) = $_->size_request;
308 $hs += $h; 657 $oh += $h;
309 if ($ws < $w) { $ws = $w } 658 if ($ow < $w) { $ow = $w }
310 } 659 }
311 660
312 return ($ws, $hs); 661 my $y = 0;
313}
314
315sub _draw {
316 my ($self) = @_;
317
318 my ($x, $y);
319 for (@{$self->{childs} || []}) { 662 for (@{$self->{children}}) {
320 $_->move (0, $y, 0); #TODO: move to size_request 663 $_->move (0, $y);
321 $_->draw; 664
665 if ($_ == $exp) {
666 $_->size_allocate ($w, $h - $oh);
667 $y += $h - $oh;
668 } else {
322 my ($w, $h) = $_->size_request; 669 my ($cw, $h) = $_->size_request;
670 $_->size_allocate ($w, $h);
323 $y += $h; 671 $y += $h;
672 }
324 } 673 }
325} 674}
326 675
676#############################################################################
677
327package Crossfire::Client::Widget::Label; 678package CFClient::Widget::Label;
328 679
329our @ISA = Crossfire::Client::Widget::; 680our @ISA = CFClient::Widget::;
330 681
331use SDL::OpenGL; 682use SDL::OpenGL;
332 683
333sub new { 684sub new {
334 my ($class, $x, $y, $z, $height, $text) = @_; 685 my ($class, %arg) = @_;
335 686
336 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 687 # TODO: color, and make height, xyz etc. optional
688 my $self = $class->SUPER::new (
689 color => [1, 1, 1],
690 height => $::FONTSIZE,
691 text => "",
692 layout => new CFClient::Layout,
693 %arg
694 );
337 695
338 $self->set_text ($text); 696 $self->set_text ($self->{text});
339 697
340 $self 698 $self
341} 699}
342 700
343sub set_text { 701sub set_text {
344 my ($self, $text) = @_; 702 my ($self, $text) = @_;
345 703
346 $self->{text} = $text; 704 $self->{text} = $text;
705 $self->{layout}->set_markup ($text);
347 706
348 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 707 delete $self->{texture};
349} 708}
350 709
351sub get_text { 710sub get_text {
352 my ($self, $text) = @_; 711 my ($self, $text) = @_;
353 712
… …
355} 714}
356 715
357sub size_request { 716sub size_request {
358 my ($self) = @_; 717 my ($self) = @_;
359 718
360 ( 719 $self->{layout}->set_width;
720 $self->{layout}->set_height ($self->{height});
721 $self->{layout}->size
722# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
723# (
361 $self->{texture}{width}, 724# $self->{texture}{width},
362 $self->{texture}{height}, 725# $self->{texture}{height},
363 ) 726# )
727# } else {
728# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
729#
730# ($w, $h)
731# }
732}
733
734sub size_allocate {
735 my ($self, $w, $h) = @_;
736
737 $self->SUPER::size_allocate ($w, $h);
738 delete $self->{texture};
364} 739}
365 740
366sub _draw { 741sub _draw {
367 my ($self) = @_; 742 my ($self) = @_;
368 743
369 my $tex = $self->{texture}; 744 my $tex = $self->{texture} ||= do {
745 $self->{layout}->set_width ($self->{w});
746 new_from_layout CFClient::Texture $self->{layout};
747 };
370 748
371 glEnable GL_BLEND; 749 glEnable GL_BLEND;
372 glEnable GL_TEXTURE_2D; 750 glEnable GL_TEXTURE_2D;
373 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
374 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
375 glBindTexture GL_TEXTURE_2D, $tex->{name};
376 753
377 glColor 1, 1, 1, 0.8; 754 glColor @{$self->{color}};
378 755
379 glBegin GL_QUADS; 756 $tex->draw_quad (0, 0);
380 glTexCoord 0, 0; glVertex 0 , 0;
381 glTexCoord 0, 1; glVertex 0 , $tex->{height};
382 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
383 glTexCoord 1, 0; glVertex $tex->{width}, 0;
384 glEnd;
385 757
386 glDisable GL_BLEND; 758 glDisable GL_BLEND;
387 glDisable GL_TEXTURE_2D; 759 glDisable GL_TEXTURE_2D;
388} 760}
389 761
390package Crossfire::Client::Widget::TextView; 762#############################################################################
391 763
392use strict; 764package CFClient::Widget::Entry;
393 765
394our @ISA = qw/Crossfire::Client::Widget/; 766our @ISA = CFClient::Widget::Label::;
395 767
768use SDL;
396use SDL::OpenGL; 769use SDL::OpenGL;
397use SDL::OpenGL::Constants;
398 770
399sub add_line { 771sub key_down {
400 my ($self, $line) = @_; 772 my ($self, $ev) = @_;
401 push @{$self->{lines}}, $line; 773
774 my $mod = $ev->key_mod;
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}
789
790sub button_down {
791 my ($self, $ev) = @_;
792
793 $self->focus_in;
794}
795
796sub mouse_motion {
797 my ($self, $ev, $x, $y) = @_;
798 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
402} 799}
403 800
404sub _draw { 801sub _draw {
405 my ($self) = @_; 802 my ($self) = @_;
406 803
407} 804 if ($FOCUS == $self) {
805 glColor 1, 1, 1;
806 } else {
807 glColor 0.7, 0.7, 0.7;
808 }
408 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
409package Crossfire::Client::Widget::MapWidget; 822package CFClient::Widget::MapWidget;
410 823
411use strict; 824use strict;
412 825
413use List::Util qw(min max); 826use List::Util qw(min max);
414 827
415use SDL; 828use SDL;
416use SDL::OpenGL; 829use SDL::OpenGL;
417use SDL::OpenGL::Constants; 830use SDL::OpenGL::Constants;
418 831
419our @ISA = Crossfire::Client::Widget::; 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}
420 843
421sub key_down { 844sub key_down {
422 print "MAPKEYDOWN\n"; 845 print "MAPKEYDOWN\n";
423} 846}
424 847
425sub key_up { 848sub key_up {
426} 849}
427 850
851sub size_request {
852 (
853 1 + int $::WIDTH / 32,
854 1 + int $::HEIGHT / 32,
855 )
856}
857
858sub update {
859 my ($self) = @_;
860
861 $self->{need_update} = 1;
862}
863
428sub _draw { 864sub _draw {
429 my ($self) = @_; 865 my ($self) = @_;
430 866
867 if (delete $self->{need_update}) {
868 glNewList $self->{list}, GL_COMPILE;
869
431 my $mx = $::CONN->{mapx}; 870 my $mx = $::CONN->{mapx};
432 my $my = $::CONN->{mapy}; 871 my $my = $::CONN->{mapy};
433 872
434 my $map = $::CONN->{map}; 873 my $map = $::CONN->{map};
435 874
436 my ($xofs, $yofs); 875 my ($xofs, $yofs);
437 876
438 my $sw = 1 + int $::WIDTH / 32; 877 my $sw = 1 + int $::WIDTH / 32;
439 my $sh = 1 + int $::HEIGHT / 32; 878 my $sh = 1 + int $::HEIGHT / 32;
440 879
441 if ($::CONN->{mapw} > $sw) { 880 if ($::CONN->{mapw} > $sw) {
442 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 881 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
443 } else { 882 } else {
444 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 883 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
445 } 884 }
446 885
447 if ($::CONN->{maph} > $sh) { 886 if ($::CONN->{maph} > $sh) {
448 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 887 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
449 } else { 888 } else {
450 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 889 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
451 } 890 }
452 891
453 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
454 glEnable GL_BLEND; 893 glEnable GL_BLEND;
455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
456 895
896 my $sw4 = ($sw + 3) & ~3;
897 my $darkness = "\x00" x ($sw4 * $sh);
898
457 for my $x (0 .. $sw - 1) { 899 for my $x (0 .. $sw - 1) {
900 my $row = $map->[$x + $xofs];
458 for my $y (0 .. $sh - 1) { 901 for my $y (0 .. $sh - 1) {
459 902
460 my $cell = $map->[$x + $xofs][$y + $yofs] 903 my $cell = $row->[$y + $yofs]
461 or next; 904 or next;
462 905
463 my $darkness = $cell->[0] * (1 / 255); 906 my $dark = $cell->[0];
464 if ($darkness < 0) { 907 if ($dark < 0) {
465 glColor 0.3, 0.3, 0.3; 908 substr $darkness, $y * $sw4 + $x, 1, chr 224;
466 } else { 909 } else {
467 glColor $darkness, $darkness, $darkness; 910 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
468 } 911 }
469 912
470 for my $num (grep $_, @$cell[1,2,3]) { 913 for my $num (grep $_, @$cell[1,2,3]) {
471 my $tex = $::CONN->{face}[$num]{texture} || next; 914 my $tex = $::CONN->{face}[$num]{texture} || next;
472 915
473 glBindTexture GL_TEXTURE_2D, $tex->{name};
474
475 my $w = $tex->{width}; 916 my $w = $tex->{width};
476 my $h = $tex->{height}; 917 my $h = $tex->{height};
477 918
478 my $px = ($x + 1) * 32 - $w; 919 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
479 my $py = ($y + 1) * 32 - $h;
480
481 glBegin GL_QUADS;
482 glTexCoord 0, 0; glVertex $px , $py;
483 glTexCoord 0, 1; glVertex $px , $py + $h;
484 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
485 glTexCoord 1, 0; glVertex $px + $w, $py;
486 glEnd; 920 }
487 } 921 }
488 } 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;
489 } 932# }
490 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
491 glDisable GL_TEXTURE_2D; 947 glDisable GL_TEXTURE_2D;
492 glDisable GL_BLEND; 948 glDisable GL_BLEND;
949
950 glEndList;
951 }
952
953 glCallList $self->{list};
493} 954}
494 955
495my %DIR = ( 956my %DIR = (
496 SDLK_KP8, [1, "north"], 957 SDLK_KP8, [1, "north"],
497 SDLK_KP9, [2, "northeast"], 958 SDLK_KP9, [2, "northeast"],
… …
541 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1002 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
542 $::CONN->send ("command run_stop"); 1003 $::CONN->send ("command run_stop");
543 } 1004 }
544} 1005}
545 1006
5461; 1007#############################################################################
547 1008
1009package CFClient::Widget::Animator;
1010
1011use SDL::OpenGL;
1012
1013our @ISA = CFClient::Widget::Bin::;
1014
1015sub moveto {
1016 my ($self, $x, $y) = @_;
1017
1018 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
1019 $self->{speed} = 0.001;
1020 $self->{time} = 1;
1021
1022 ::animation_start $self;
1023}
1024
1025sub animate {
1026 my ($self, $interval) = @_;
1027
1028 $self->{time} -= $interval * $self->{speed};
1029 if ($self->{time} <= 0) {
1030 $self->{time} = 0;
1031 ::animation_stop $self;
1032 }
1033
1034 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
1035
1036 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
1037 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
1038}
1039
1040sub _draw {
1041 my ($self) = @_;
1042
1043 glPushMatrix;
1044 glRotate $self->{time} * 1000, 0, 1, 0;
1045 $self->{children}[0]->draw;
1046 glPopMatrix;
1047}
1048
1049#############################################################################
1050
1051package CFClient::Widget::Toplevel;
1052
1053our @ISA = CFClient::Widget::Container::;
1054
1055sub size_request {
1056 ($::WIDTH, $::HEIGHT)
1057}
1058
1059sub size_allocate {
1060 my ($self, $w, $h) = @_;
1061
1062 $self->SUPER::size_allocate ($w, $h);
1063
1064 $_->size_allocate ($_->size_request)
1065 for @{$self->{children}};
1066}
1067
1068sub translate {
1069 my ($self, $x, $y) = @_;
1070
1071 ($x, $y)
1072}
1073
1074sub update {
1075 my ($self) = @_;
1076
1077 $self->size_allocate ($self->size_request);
1078 ::refresh ();
1079}
1080
1081sub add {
1082 my ($self, $widget) = @_;
1083
1084 $self->SUPER::add ($widget);
1085
1086 $widget->size_allocate ($widget->size_request);
1087}
1088
1089sub draw {
1090 my ($self) = @_;
1091
1092 $self->_draw;
1093}
1094
1095#############################################################################
1096
1097package CFClient::Widget;
1098
1099$TOPLEVEL = new CFClient::Widget::Toplevel;
1100
11011
1102

Diff Legend

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