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.25 by root, Sat Apr 8 22:08:24 2006 UTC vs.
Revision 1.43 by root, Sun Apr 9 22:12:11 2006 UTC

5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client;
11
10our $FOCUS; # the widget with current focus 12our $FOCUS; # the widget with current focus
11our @ACTIVE_WIDGETS;
12 13
13# class methods for events 14# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 15sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 16sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 17sub feed_sdl_button_down_event { }
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 18sub feed_sdl_button_up_event { }
18 19
19sub new { 20sub new {
20 my $class = shift; 21 my $class = shift;
21 22
22 bless { @_ }, $class 23 bless { @_ }, $class
23}
24
25sub activate {
26 push @ACTIVE_WIDGETS, $_[0];
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28}
29
30sub deactivate {
31 @ACTIVE_WIDGETS =
32 sort { $a->{z} <=> $b->{z} }
33 grep { $_ && $_ != $_[0] }
34 @ACTIVE_WIDGETS;
35} 24}
36 25
37sub move { 26sub move {
38 my ($self, $x, $y, $z) = @_; 27 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 28 $self->{x} = $x;
44sub needs_redraw { 33sub needs_redraw {
45 0 34 0
46} 35}
47 36
48sub size_request { 37sub size_request {
38 require Carp;
49 die "size_request is abtract"; 39 Carp::confess "size_request is abtract";
40}
41
42sub size_allocate {
43 my ($self, $w, $h) = @_;
44
45 $self->{w} = $w;
46 $self->{h} = $h;
50} 47}
51 48
52sub focus_in { 49sub focus_in {
53 my ($widget) = @_; 50 my ($widget) = @_;
54 $FOCUS = $widget; 51 $FOCUS = $widget;
72 69
73sub button_up { 70sub button_up {
74 my ($widget, $sdlev) = @_; 71 my ($widget, $sdlev) = @_;
75} 72}
76 73
77sub w { $_[0]->{w} } 74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 79
83sub draw { 80sub draw {
88 $self->_draw; 85 $self->_draw;
89 glPopMatrix; 86 glPopMatrix;
90} 87}
91 88
92sub _draw { 89sub _draw {
93 my ($widget) = @_; 90 my ($self) = @_;
91
92 warn "no draw defined for $self\n";
94} 93}
95 94
96sub bbox { 95sub bbox {
97 my ($widget) = @_; 96 my ($self) = @_;
97 my ($w, $h) = $self->size_request;
98 (
99 $self->{x},
100 $self->{y},
101 $self->{x} = $w,
102 $self->{y} = $h
103 )
104}
105
106sub find_widget {
107 my ($self, $x, $y) = @_;
108
109 return $self
110 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
111 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
112
113 ()
114}
115
116sub del_parent { $_[0]->{parent} = undef }
117
118sub set_parent {
119 my ($self, $par) = @_;
120
121 $self->{parent} = $par;
122 Scalar::Util::weaken $self->{parent};
123}
124
125sub get_parent {
126 $_[0]->{parent}
127}
128
129sub update {
130 my ($self) = @_;
131
132 $self->{parent}->update
133 if $self->{parent};
98} 134}
99 135
100sub DESTROY { 136sub DESTROY {
101 my ($self) = @_; 137 my ($self) = @_;
102 138
103 $self->deactivate; 139 #$self->deactivate;
104} 140}
141
142#############################################################################
105 143
106package Crossfire::Client::Widget::Container; 144package Crossfire::Client::Widget::Container;
107 145
108our @ISA = Crossfire::Client::Widget::; 146our @ISA = Crossfire::Client::Widget::;
109 147
148sub new {
149 my ($class, @widgets) = @_;
150
151 my $self = $class->SUPER::new (children => []);
152 $self->add ($_) for @widgets;
153
154 $self
155}
156
157sub add {
158 my ($self, $chld, $expand) = @_;
159
160 $chld->{expand} = $expand;
161 $chld->set_parent ($self);
162
163 @{$self->{children}} =
164 sort { $a->{z} <=> $b->{z} }
165 @{$self->{children}}, $chld;
166
167 $self->size_allocate ($self->{w}, $self->{h})
168 if $self->{w}; #TODO: check for "realised state"
169}
170
171sub remove {
172 my ($self, $widget) = @_;
173
174 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
175
176 $self->size_allocate ($self->{w}, $self->{h});
177}
178
179sub find_widget {
180 my ($self, $x, $y) = @_;
181
182 my $res;
183
184 for (@{ $self->{children} }) {
185 $res = $_->find_widget ($x, $y)
186 and return $res;
187 }
188
189 ()
190}
191
192sub _draw {
193 my ($self) = @_;
194
195 $_->draw for @{$self->{children}};
196}
197
198#############################################################################
199
200package Crossfire::Client::Widget::Bin;
201
202our @ISA = Crossfire::Client::Widget::Container::;
203
204sub child { $_[0]->{children}[0] }
205
206sub size_request {
207 $_[0]{children}[0]->size_request if $_[0]{children}[0];
208}
209
210sub size_allocate {
211 my ($self, $w, $h) = @_;
212
213 $self->SUPER::size_allocate ($w, $h);
214 $self->{children}[0]->size_allocate ($w, $h)
215 if $self->{children}[0]
216}
217
218#############################################################################
219
220package Crossfire::Client::Widget::Toplevel;
221
222our @ISA = Crossfire::Client::Widget::Container::;
223
224sub update {
225 my ($self) = @_;
226
227 ::refresh ();
228}
229
230sub add {
231 my ($self, $widget) = @_;
232
233 $self->SUPER::add ($widget);
234
235 $widget->size_allocate ($widget->size_request);
236}
237
238#############################################################################
239
240package Crossfire::Client::Widget::Window;
241
242our @ISA = Crossfire::Client::Widget::Bin::;
243
110use SDL::OpenGL; 244use SDL::OpenGL;
111 245
112sub add { $_[0]->{child} = $_[1] } 246sub new {
113sub get { $_[0]->{child} } 247 my ($class, $x, $y, $z, $w, $h) = @_;
114 248
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 249 my $self = $class->SUPER::new;
116 250
117sub _draw { die "Containers can't be drawn!" } 251 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
252}
118 253
119package Crossfire::Client::Widget::Window; 254sub update {
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_; 255 my ($self) = @_;
127 $self->SUPER::add ($chld); 256
128 $self->render_chld; 257 $self->render_chld;
258 $self->SUPER::update;
129} 259}
130 260
131sub render_chld { 261sub render_chld {
132 my ($self) = @_; 262 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135 263
136 $self->{texture} = 264 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 265 Crossfire::Client::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 266 $self->{w}, $self->{h}, sub { $self->child->draw }
139 ); 267 );
140 $self->{texture}->upload;
141} 268}
142 269
143sub size_request { 270sub size_allocate {
144 my ($self) = @_; 271 my ($self, $w, $h) = @_;
145 my $chld = $self->get 272
146 or return (0, 0); 273 $self->{w} = $w;
147 $chld->size_request 274 $self->{h} = $h;
275
276 $self->child->size_allocate ($w, $h);
277
278 $self->render_chld;
148} 279}
149 280
150sub _draw { 281sub _draw {
151 my ($self) = @_; 282 my ($self) = @_;
152 283
153 my ($w, $h) = $self->size_request;#TODO# use widht/height of texture 284 my ($w, $h) = ($self->w, $self->h);
285
154 my $tex = $self->{texture} 286 my $tex = $self->{texture}
155 or return; 287 or return;
156 288
157 glEnable GL_BLEND; 289 glEnable GL_BLEND;
158 glEnable GL_TEXTURE_2D; 290 glEnable GL_TEXTURE_2D;
159 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 291 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
160 glBindTexture GL_TEXTURE_2D, $tex->{name}; 292 glBindTexture GL_TEXTURE_2D, $tex->{name};
161
162 glColor 1, 1, 1;
163 293
164 glBegin GL_QUADS; 294 glBegin GL_QUADS;
165 glTexCoord 0, 0; glVertex 0, 0; 295 glTexCoord 0, 0; glVertex 0, 0;
166 glTexCoord 0, 1; glVertex 0, $h; 296 glTexCoord 0, 1; glVertex 0, $h;
167 glTexCoord 1, 1; glVertex $w, $h; 297 glTexCoord 1, 1; glVertex $w, $h;
170 300
171 glDisable GL_BLEND; 301 glDisable GL_BLEND;
172 glDisable GL_TEXTURE_2D; 302 glDisable GL_TEXTURE_2D;
173} 303}
174 304
305#############################################################################
306
175package Crossfire::Client::Widget::Frame; 307package Crossfire::Client::Widget::Frame;
176 308
177our @ISA = Crossfire::Client::Widget::Container::; 309our @ISA = Crossfire::Client::Widget::Bin::;
178 310
179use SDL::OpenGL; 311use SDL::OpenGL;
180 312
181sub size_request { 313sub size_request {
182 my ($self) = @_; 314 my ($self) = @_;
183 my $chld = $self->get 315 my $chld = $self->child
184 or return (0, 0); 316 or return (0, 0);
317
318 $chld->move (2, 2);
319
185 map { $_ + 4 } $chld->size_request; 320 map { $_ + 4 } $chld->size_request;
186} 321}
187 322
323sub size_allocate {
324 my ($self, $w, $h) = @_;
325
326 $self->{w} = $w;
327 $self->{h} = $h;
328
329 $self->child->size_allocate ($w - 4, $h - 4);
330 $self->child->move (2, 2);
331}
332
188sub _draw { 333sub _draw {
189 my ($self) = @_; 334 my ($self) = @_;
190 335
191 my $chld = $self->get; 336 my $chld = $self->child;
192 337
193 my ($w, $h) = $chld->size_request; 338 my ($w, $h) = $chld->size_request;
194 339
195 glColor 1, 0, 0;
196 glBegin GL_QUADS; 340 glBegin GL_QUADS;
341 glColor 0, 0, 0;
197 glTexCoord 0, 0; glVertex 0 , 0; 342 glTexCoord 0, 0; glVertex 0 , 0;
198 glTexCoord 0, 1; glVertex 0 , $h + 4; 343 glTexCoord 0, 1; glVertex 0 , $h + 4;
199 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 344 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
200 glTexCoord 1, 0; glVertex $w + 4 , 0; 345 glTexCoord 1, 0; glVertex $w + 4 , 0;
201 glEnd; 346 glEnd;
202 347
203 glPushMatrix;
204 glTranslate (2, 2, 0);
205 $chld->draw; 348 $chld->draw;
206 glPopMatrix;
207} 349}
350
351#############################################################################
352
353package Crossfire::Client::Widget::FancyFrame;
354
355our @ISA = Crossfire::Client::Widget::Bin::;
356
357use SDL::OpenGL;
358
359my @tex =
360 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
361 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
362
363sub size_request {
364 my ($self) = @_;
365
366 my ($w, $h) = $self->SUPER::size_request;
367
368 $h += $tex[1]->{height};
369 $h += $tex[4]->{height};
370 $w += $tex[2]->{width};
371 $w += $tex[3]->{width};
372
373 ($w, $h)
374}
375
376sub size_allocate {
377 my ($self, $w, $h) = @_;
378
379 $self->SUPER::size_allocate ($w, $h);
380
381 $h -= $tex[1]->{height};
382 $h -= $tex[4]->{height};
383 $w -= $tex[2]->{width};
384 $w -= $tex[3]->{width};
385
386 $h = $h < 0 ? 0 : $h;
387 $w = $w < 0 ? 0 : $w;
388
389 $self->child->size_allocate ($w, $h);
390 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
391}
392
393sub _draw {
394 my ($self) = @_;
395
396 my ($w, $h) = ($self->{w}, $self->{h});
397 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
398
399 glEnable GL_BLEND;
400 glEnable GL_TEXTURE_2D;
401 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
402 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
403
404 my $top = $tex[1];
405 glBindTexture GL_TEXTURE_2D, $top->{name};
406
407 glBegin GL_QUADS;
408 glTexCoord 0, 0; glVertex 0 , 0;
409 glTexCoord 0, 1; glVertex 0 , $top->{height};
410 glTexCoord 1, 1; glVertex $w , $top->{height};
411 glTexCoord 1, 0; glVertex $w , 0;
412 glEnd;
413
414 my $left = $tex[3];
415 glBindTexture GL_TEXTURE_2D, $left->{name};
416
417 glBegin GL_QUADS;
418 glTexCoord 0, 0; glVertex 0 , $top->{height};
419 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
420 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
421 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
422 glEnd;
423
424 my $right = $tex[2];
425 glBindTexture GL_TEXTURE_2D, $right->{name};
426
427 glBegin GL_QUADS;
428 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
429 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
430 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
431 glTexCoord 1, 0; glVertex $w , $top->{height};
432 glEnd;
433
434 my $bottom = $tex[4];
435 glBindTexture GL_TEXTURE_2D, $bottom->{name};
436
437 glBegin GL_QUADS;
438 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
439 glTexCoord 0, 1; glVertex 0 , $h;
440 glTexCoord 1, 1; glVertex $w , $h;
441 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
442 glEnd;
443
444 my $bg = $tex[0];
445 glBindTexture GL_TEXTURE_2D, $bg->{name};
446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
447 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
448 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
449
450 my $rep_x = $cw / $bg->{width};
451 my $rep_y = $ch / $bg->{height};
452
453 glBegin GL_QUADS;
454 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
455 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
456 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
457 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
458 glEnd;
459
460 glDisable GL_BLEND;
461 glDisable GL_TEXTURE_2D;
462
463 $self->child->draw;
464
465}
466
467#############################################################################
208 468
209package Crossfire::Client::Widget::Table; 469package Crossfire::Client::Widget::Table;
210 470
211our @ISA = Crossfire::Client::Widget::Container::; 471our @ISA = Crossfire::Client::Widget::Bin::;
212 472
213use SDL::OpenGL; 473use SDL::OpenGL;
214 474
215sub add { 475sub add {
216 my ($self, $x, $y, $chld) = @_; 476 my ($self, $x, $y, $chld) = @_;
477 my $old_chld = $self->{children}[$y][$x];
478
217 $self->{childs}[$y][$x] = $chld; 479 $self->{children}[$y][$x] = $chld;
480 $chld->set_parent ($self);
481 $self->update;
218} 482}
219 483
220sub max_row_height { 484sub max_row_height {
221 my ($self, $row) = @_; 485 my ($self, $row) = @_;
222 486
223 my $hs = 0; 487 my $hs = 0;
224 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 488 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
225 my $c = $self->{childs}->[$row]->[$xi]; 489 my $c = $self->{children}->[$row]->[$xi];
226 if ($c) { 490 if ($c) {
227 my ($w, $h) = $c->size_request; 491 my ($w, $h) = $c->size_request;
228 if ($hs < $h) { $hs = $h } 492 if ($hs < $h) { $hs = $h }
229 } 493 }
230 } 494 }
233 497
234sub max_col_width { 498sub max_col_width {
235 my ($self, $col) = @_; 499 my ($self, $col) = @_;
236 500
237 my $ws = 0; 501 my $ws = 0;
238 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 502 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
239 my $c = ($self->{childs}->[$yi] || [])->[$col]; 503 my $c = ($self->{children}->[$yi] || [])->[$col];
240 if ($c) { 504 if ($c) {
241 my ($w, $h) = $c->size_request; 505 my ($w, $h) = $c->size_request;
242 if ($ws < $w) { $ws = $w } 506 if ($ws < $w) { $ws = $w }
243 } 507 }
244 } 508 }
248sub size_request { 512sub size_request {
249 my ($self) = @_; 513 my ($self) = @_;
250 514
251 my ($hs, $ws) = (0, 0); 515 my ($hs, $ws) = (0, 0);
252 516
253 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 517 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
254 $hs += $self->max_row_height ($yi); 518 $hs += $self->max_row_height ($yi);
255 } 519 }
256 520
257 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 521 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
258 my $wm = 0; 522 my $wm = 0;
259 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 523 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
260 $wm += $self->max_col_width ($xi) 524 $wm += $self->max_col_width ($xi)
261 } 525 }
262 if ($ws < $wm) { $ws = $wm } 526 if ($ws < $wm) { $ws = $wm }
263 } 527 }
264 528
267 531
268sub _draw { 532sub _draw {
269 my ($self) = @_; 533 my ($self) = @_;
270 534
271 my $y = 0; 535 my $y = 0;
272 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 536 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
273 my $x = 0; 537 my $x = 0;
274 538
275 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 539 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
276 540
277 glPushMatrix;
278 glTranslate ($x, $y, 0);#TODO#there must be no translate here, instead the widget must be moved
279 my $c = $self->{childs}->[$yi]->[$xi]; 541 my $c = $self->{children}->[$yi]->[$xi];
542 if ($c) {
543 $c->move ($x, $y, 0); #TODO: Move to size_request
280 $c->draw if $c; 544 $c->draw if $c;
281 glPopMatrix; 545 }
282 546
283 $x += $self->max_col_width ($xi); 547 $x += $self->max_col_width ($xi);
284 } 548 }
285 549
286 $y += $self->max_row_height ($yi); 550 $y += $self->max_row_height ($yi);
287 } 551 }
288} 552}
289 553
554#############################################################################
555
290package Crossfire::Client::Widget::VBox; 556package Crossfire::Client::Widget::VBox;
291 557
292our @ISA = Crossfire::Client::Widget::Container::; 558our @ISA = Crossfire::Client::Widget::Container::;
293 559
294use SDL::OpenGL; 560use SDL::OpenGL;
295 561
296sub add {
297 my ($self, $chld) = @_;
298 push @{$self->{childs}}, $chld;
299}
300
301sub size_request { 562sub size_request {
302 my ($self) = @_; 563 my ($self) = @_;
303 564
304 my ($hs, $ws) = (0, 0); 565 my @alloc = map [$_->size_request], @{$self->{children}};
566
567 (
568 (List::Util::max map $_->[0], @alloc),
569 (List::Util::sum map $_->[1], @alloc),
570 )
571}
572
573sub size_allocate {
574 my ($self, $w, $h) = @_;
575
576 $self->w ($w);
577 $self->h ($h);
578
579 my $exp;
580 my @oth;
581 # find expand widget
305 for (@{$self->{childs} || []}) { 582 for (@{$self->{children}}) {
583 if ($_->{expand}) {
584 $exp = $_;
585 last;
586 }
587 push @oth, $_;
588 }
589
590 my ($ow, $oh);
591
592 # get sizes of other widgets
593 for (@oth) {
306 my ($w, $h) = $_->size_request; 594 my ($w, $h) = $_->size_request;
307 $hs += $h; 595 $oh += $h;
308 if ($ws < $w) { $ws = $w } 596 if ($ow < $w) { $ow = $w }
309 } 597 }
310 598
311 return ($ws, $hs); 599 my $y = 0;
312}
313
314sub _draw {
315 my ($self) = @_;
316
317 my ($x, $y);
318 for (@{$self->{childs} || []}) { 600 for (@{$self->{children}}) {
319 glPushMatrix; 601 $_->move (0, $y);
320 glTranslate (0, $y, 0);# see above TODO 602
321 $_->draw; 603 if ($_ == $exp) {
322 glPopMatrix; 604 $_->size_allocate ($w, $h - $oh);
605 $y += $h - $oh;
606 } else {
323 my ($w, $h) = $_->size_request; 607 my ($cw, $h) = $_->size_request;
608 $_->size_allocate ($w, $h);
324 $y += $h; 609 $y += $h;
610 }
325 } 611 }
326} 612}
613
614#############################################################################
327 615
328package Crossfire::Client::Widget::Label; 616package Crossfire::Client::Widget::Label;
329 617
330our @ISA = Crossfire::Client::Widget::; 618our @ISA = Crossfire::Client::Widget::;
331 619
332use SDL::OpenGL; 620use SDL::OpenGL;
333 621
334sub new { 622sub new {
335 my ($class, $x, $y, $z, $ttf, $text) = @_; 623 my ($class, $x, $y, $z, $height, $text) = @_;
336 624
625 # TODO: color, and make height, xyz etc. optional
337 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); 626 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
338 627
339 $self->set_text ($text); 628 $self->set_text ($text);
340 629
341 $self 630 $self
342} 631}
343 632
344sub set_text { 633sub set_text {
345 my ($self, $text) = @_; 634 my ($self, $text) = @_;
635
636 $self->{text} = $text;
346 $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; 637 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
638
639 $self->update;
347} 640}
348 641
349sub get_text { 642sub get_text {
350 my ($self, $text) = @_; 643 my ($self, $text) = @_;
644
351 $self->{text} 645 $self->{text}
352} 646}
353 647
354sub size_request { 648sub size_request {
355 my ($self) = @_; 649 my ($self) = @_;
365 659
366 my $tex = $self->{texture}; 660 my $tex = $self->{texture};
367 661
368 glEnable GL_BLEND; 662 glEnable GL_BLEND;
369 glEnable GL_TEXTURE_2D; 663 glEnable GL_TEXTURE_2D;
664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
371 glBindTexture GL_TEXTURE_2D, $tex->{name}; 666 glBindTexture GL_TEXTURE_2D, $tex->{name};
372 667
373 glColor 1, 1, 1; 668 glColor 1, 0, 0, 1; # TODO color
374 669
375 glBegin GL_QUADS; 670 glBegin GL_QUADS;
376 glTexCoord 0, 0; glVertex 0 , 0; 671 glTexCoord 0, 0; glVertex 0 , 0;
377 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 672 glTexCoord 0, 1; glVertex 0 , $tex->{height};
378 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 673 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
381 676
382 glDisable GL_BLEND; 677 glDisable GL_BLEND;
383 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
384} 679}
385 680
681#############################################################################
682
386package Crossfire::Client::Widget::TextView; 683package Crossfire::Client::Widget::TextEntry;
387 684
388use strict;
389
390our @ISA = qw/Crossfire::Client::Widget/; 685our @ISA = Crossfire::Client::Widget::Label::;
391 686
687use SDL;
392use SDL::OpenGL; 688use SDL::OpenGL;
393use SDL::OpenGL::Constants;
394 689
395sub add_line { 690sub key_down {
396 my ($self, $line) = @_; 691 my ($self, $ev) = @_;
397 push @{$self->{lines}}, $line;
398}
399 692
400sub _draw { 693 my $mod = $ev->key_mod;
401 my ($self) = @_; 694 my $sym = $ev->key_sym;
402 695
696 $ev->set_unicode (1);
697 my $uni = $ev->key_unicode;
698
699 my $text = $self->get_text;
700
701 if ($sym == SDLK_BACKSPACE) {
702 substr $text, -1, 1, '';
703
704 } elsif ($uni) {
705 $text .= chr $uni;
706 }
707 $self->set_text ($text);
403} 708}
709
710#############################################################################
404 711
405package Crossfire::Client::Widget::MapWidget; 712package Crossfire::Client::Widget::MapWidget;
406 713
407use strict; 714use strict;
408 715
419} 726}
420 727
421sub key_up { 728sub key_up {
422} 729}
423 730
731sub size_request {
732
733}
734
735sub size_allocate {
736}
737
424sub _draw { 738sub _draw {
425 my ($self) = @_; 739 my ($self) = @_;
426 740
427 my $mx = $::CONN->{mapx}; 741 my $mx = $::CONN->{mapx};
428 my $my = $::CONN->{mapy}; 742 my $my = $::CONN->{mapy};
433 747
434 my $sw = 1 + int $::WIDTH / 32; 748 my $sw = 1 + int $::WIDTH / 32;
435 my $sh = 1 + int $::HEIGHT / 32; 749 my $sh = 1 + int $::HEIGHT / 32;
436 750
437 if ($::CONN->{mapw} > $sw) { 751 if ($::CONN->{mapw} > $sw) {
438 $xofs = ($sw - $::CONN->{mapw}) * 0.5; 752 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
439 } else { 753 } else {
440 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 754 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
441 } 755 }
442 756
443 if ($::CONN->{maph} > $sh) { 757 if ($::CONN->{maph} > $sh) {
444 $yofs = ($sh - $::CONN->{maph}) * 0.5; 758 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
445 } else { 759 } else {
446 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 760 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
447 } 761 }
448 762
449 glEnable GL_TEXTURE_2D; 763 glEnable GL_TEXTURE_2D;
450 glEnable GL_BLEND; 764 glEnable GL_BLEND;
451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 765 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
452 766
453 warn "<$mx,$my> <$xofs,$yofs>\n";#d# 767 my $sw4 = ($sw + 3) & ~3;
768 my $lighting = "\x00" x ($sw4 * $sh);
454 769
455 for my $x (0 .. $sw - 1) { 770 for my $x (0 .. $sw - 1) {
456 for my $y (0 .. $sh - 1) { 771 for my $y (0 .. $sh - 1) {
457 772
458 my $cell = $map->[$x + $xofs][$y + $yofs] 773 my $cell = $map->[$x + $xofs][$y + $yofs]
459 or next; 774 or next;
460 775
461 my $darkness = $cell->[0] * (1 / 255); 776 my $darkness = $cell->[0] * (1 / 255);
462 if ($darkness < 0) { 777 if ($darkness < 0) {
463 glColor 0.3, 0.3, 0.3; 778 $darkness = 0.15;
464 } else {
465 glColor $darkness, $darkness, $darkness;
466 } 779 }
780 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
467 781
468 for my $num (grep $_, @$cell[1,2,3]) { 782 for my $num (grep $_, @$cell[1,2,3]) {
469 my $tex = $::CONN->{face}[$num]{texture} || next; 783 my $tex = $::CONN->{face}[$num]{texture} || next;
470 784
471 glBindTexture GL_TEXTURE_2D, $tex->{name}; 785 glBindTexture GL_TEXTURE_2D, $tex->{name};
483 glTexCoord 1, 0; glVertex $px + $w, $py; 797 glTexCoord 1, 0; glVertex $px + $w, $py;
484 glEnd; 798 glEnd;
485 } 799 }
486 } 800 }
487 } 801 }
802
803# if (1) { # higher quality darkness
804# $lighting =~ s/(.)/$1$1$1/gs;
805# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
806#
807# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
808#
809# $lighting = $pb->get_pixels;
810# $lighting =~ s/(.)../$1/gs;
811# }
812
813 $lighting = new Crossfire::Client::Texture
814 width => $sw4,
815 height => $sh,
816 data => $lighting,
817 internalformat => GL_ALPHA4,
818 format => GL_ALPHA;
819
820 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
821 glColor 0, 0, 0, 0.75;
822 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
823 glBindTexture GL_TEXTURE_2D, $lighting->{name};
824 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
825 glBegin GL_QUADS;
826 glTexCoord 0, 0; glVertex 0 , 0;
827 glTexCoord 0, 1; glVertex 0 , $sh * 32;
828 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
829 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
830 glEnd;
488 831
489 glDisable GL_TEXTURE_2D; 832 glDisable GL_TEXTURE_2D;
490 glDisable GL_BLEND; 833 glDisable GL_BLEND;
491} 834}
492 835
539 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 882 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
540 $::CONN->send ("command run_stop"); 883 $::CONN->send ("command run_stop");
541 } 884 }
542} 885}
543 886
887#############################################################################
888
889package Crossfire::Client::Widget::Animator;
890
891use SDL::OpenGL;
892
893our @ISA = Crossfire::Client::Widget::Bin::;
894
895sub moveto {
896 my ($self, $x, $y) = @_;
897
898 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
899 $self->{speed} = 0.2;
900 $self->{time} = 1;
901
902 ::animation_start $self;
903}
904
905sub animate {
906 my ($self, $interval) = @_;
907
908 $self->{time} -= $interval * $self->{speed};
909 if ($self->{time} <= 0) {
910 $self->{time} = 0;
911 ::animation_stop $self;
912 }
913
914 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
915
916 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
917 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
918}
919
920sub _draw {
921 my ($self) = @_;
922
923 glPushMatrix;
924 glRotate $self->{time} * 10000, 0, 1, 0;
925 $self->{children}[0]->draw;
926 glPopMatrix;
927}
928
5441; 9291;
545 930

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines