Merge lp:~logan/ubuntu/raring/stjerm/new-upstream into lp:ubuntu/raring/stjerm

[Logan Rosen]

[Charlie_Smotherman (cjsmo)]

Please remove the ".svn" dirs from your branch

review: Needs Fixing

[Charlie_Smotherman (cjsmo)]

Sorry to be unclear

bzr commit -m '* New upstream release.
* Drop debian/patches/man-hyphen.patch (fixed upstream).
* Bump Standards-Version to 3.9.3.'
Committing to: /home/charlie/stjerm/stjerm/
modified ChangeLog
modified INSTALL
modified configure.ac
missing .pc/applied-patches
deleted .pc/applied-patches
missing .pc/man-hyphen.patch
deleted .pc/man-hyphen.patch
missing .pc/man-hyphen.patch/doc
deleted .pc/man-hyphen.patch/doc
missing .pc/man-hyphen.patch/doc/stjerm.8
deleted .pc/man-hyphen.patch/doc/stjerm.8
modified debian/changelog
modified debian/control
deleted debian/patches
deleted debian/patches/man-hyphen.patch
deleted debian/patches/series
added doc/.svn
modified doc/stjerm.8
added doc/.svn/all-wcprops
added doc/.svn/dir-prop-base
added doc/.svn/entries
added doc/.svn/prop-base
added doc/.svn/props
added doc/.svn/text-base
added doc/.svn/tmp
added doc/.svn/text-base/Makefile.am.svn-base
added doc/.svn/text-base/stjerm.8.svn-base
added doc/.svn/tmp/prop-base
added doc/.svn/tmp/props
added doc/.svn/tmp/text-base
added src/.svn
modified src/Makefile.am
modified src/config.c
modified src/mainwindow.c
modified src/popupmenu.c
modified src/stjerm.h
modified src/term.c
added src/.svn/all-wcprops
added src/.svn/dir-prop-base
added src/.svn/entries
added src/.svn/prop-base
added src/.svn/props
added src/.svn/text-base
added src/.svn/tmp
added src/.svn/text-base/Makefile.am.svn-base
added src/.svn/text-base/config.c.svn-base
added src/.svn/text-base/main.c.svn-base
added src/.svn/text-base/mainwindow.c.svn-base
added src/.svn/text-base/popupmenu.c.svn-base
added src/.svn/text-base/shortcut.c.svn-base
added src/.svn/text-base/stjerm.h.svn-base
added src/.svn/text-base/term.c.svn-base
added src/.svn/tmp/prop-base
added src/.svn/tmp/props
added src/.svn/tmp/text-base
Committed revision 4.

It seems "doc/.svn" and "src/.svn" remain

review: Needs Fixing

[lp:~logan/ubuntu/raring/stjerm/new-upstream]

6. By Logan Rosen on 2012-11-13

Remove doc/.svn/ and src/.svn/ directories as well.

Unmerged revisions

6. By Logan Rosen on 2012-11-13

Remove doc/.svn/ and src/.svn/ directories as well.

5. By Logan Rosen on 2012-11-12

Remove .svn directory.

4. By Logan Rosen on 2012-11-03

* New upstream release.
* Drop debian/patches/man-hyphen.patch (fixed upstream).
* Bump Standards-Version to 3.9.3.

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2011-10-15 21:47:28 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-man-hyphen.patch

=== removed directory '.pc/man-hyphen.patch'
=== removed directory '.pc/man-hyphen.patch/doc'
=== removed file '.pc/man-hyphen.patch/doc/stjerm.8'
--- .pc/man-hyphen.patch/doc/stjerm.8	2011-10-15 21:47:28 +0000
+++ .pc/man-hyphen.patch/doc/stjerm.8	1970-01-01 00:00:00 +0000
@@ -1,137 +0,0 @@
-.TH STJERM "8" "Last Change: 19 Jul 2011" "stjerm 0.15" ""
-.SH NAME
-stjerm \- quake\-style terminal emulator
-.SH SYNOPSIS
-.B stjerm [-OPTION] [-OPTION] ... [-OPTION]
-.SH DESCRIPTION
-.B stjerm
-is a quake\-style terminal. It is minimalistic and works
-well with compiz.
-.B stjerm
-can be configured via commandline or the .Xdefaults file.
-
-The following list of options displays the .Xdefaults 
-option first and then the commandline option.
-The commandline options have a higher priority and 
-thus override the .Xdefaults options.
-.SH NOTES
-If you run \fBstjerm\fR with an action it will not parse other commandline options and will exit.
-
-If you specify a hex color on the commandline you have to ommit the \fB#\fR char. 
-Otherwise the option will not get parsed.
-This restriction only affects the commandline options, not the .Xdefaults options.
-.SH ACTIONS
-.TP
-.B "\-\-help"
-Displays menu with commandline options.
-.TP
-.B "\-\-info"
-Displays menu with .Xdefaults options.
-.TP
-.B "\-\-version"
-Display the current application version.
-.TP
-.B "\-\-toggle"
-Show/hide the current \fBstjerm\fR instance.
-.SH OPTIONS
-.TP
-.B "key, \-k"
-Shortcut key which shows and hides \fBstjerm\fR (eg: f12). If you don't specify a shortcut key, you can only show/hide \fBstjerm\fR if you run \fBstjerm\fR with \fI\-\-toggle\fR.
-.TP
-.B "mod, \-m"
-Modifier key, which has to be pressed in combination with the shortcut key to show/hide
-.B stjerm
-: shift, control, alt, windows, none. Default: \fInone\fR.
-.TP
-.B "keymod, \-km"
-Modifier for keyboard shortcuts. Can be a combination (with +) of modifiers (eg: control+alt). Default: \fIcontrol+shift\fR.
-.TP
-.B "autohide, \-ah"
-Whether or not to hide stjerm when it looses focus. Default: \fItrue\fR.
-.TP
-.B "font, \-fn"
-Terminal font and size (eg: Sans 10). Default: \fIBitstream Vera Sans Mono 10\fR.
-.TP
-.B "background, \-bg"
-Background color of the terminal. If the terminal is transparent this is the tint color. Default: \fIBlack\fR.
-.TP
-.B "foreground, \-fg"
-Foreground color of the terminal. This is the font color. Default: \fIWhite\fR.
-.TP
-.B "allowbold, \-ab"
-Allow bold fonts or not. Default: \fItrue\fR
-.TP
-.B "border, \-b"
-Border type: thin, thick, none. Default: \fInone\fR.
-.TP
-.B "opacity, \-o"
-Opacity (range: 10 - 100). If compositing is enabled \fBstjerm\fR will use real transparency. Otherwise you get pseudo\-transparency.
-.TP
-.B "bgimage, \-bgimg"
-Background image file. Specify the filename. Default: \fIdisabled\fR.
-.TP
-.B "width, \-w"
-Window width, either as an integer or a percentage (eg, 50%). Default: \fI800\fR.
-.TP
-.B "height, \-h"
-Window height, either as an integer or a percentage (eg, 50%). Default: \fI400\fR.
-.TP
-.B "position, \-p"
-Window position: top, bottom, left, right. Default: \fItop\fR.
-.TP
-.B "scrollbar, \-s"
-Scrollbar position: left, right, none. Default: \fInone\fR.
-.TP
-.B "shell, \-sh"
-Terminal shell. Default: the user's default shell.
-.TP
-.B "lines, \-l"
-Scrollback lines. 0 to disable scrollback. Default: \fI1000\fR.
-.TP
-.B "showtab, \-st"
-Tabbar visibility: never, one, always. One means the tabbar is visible if more than one tab is opened. Default: \fIone\fR.
-.TP
-.B "tabpos, \-tp"
-Tabbar position: top, bottom, left, right. Default: \fIbottom\fR.
-.TP
-.B "tablabel, \-tl"
-Label of the tabs. The terminal number gets appended automatically. Default: \fIterm\fR.
-.TP
-.B "tabfill, \-tf"
-Whether tabs fill whole tabbar space. Default: \fItrue\fR.
-.TP
-.B "scroll, \-sc"
-Whether to scroll the terminal on output. Default: \fItrue\fR.
-.TP
-.B "colorX, \-cX"
-Specify color X of the terminals color palette. You may specify no palette, or a complete one with 16 total colors.
-For this you have to use \-c0, \-c1, ..., \-c15 or the equivalent color0, color1,... color15.
-.TP
-.B "fixedX, \-fX"
-Overrides the calculated horizontal position of the window. Specifies the location of the left of the window.
-.TP
-.B "fixedY, \-fY"
-Overrides the calculated vertical position of the window. Specifies the location of the top of the window.
-.TP
-.B "allowreorder, \-ar"
-Allows the tabs of the tab bar to be reordered.
-.SH EXAMPLES
-To run stjerm with F12 as shortcut key, the opacity of 60 and a green foreground color, use:
-
-stjerm -k f12 -o 60 -fg 66ff11
-
-
-To specify the same options in the .Xdefaults file, write this in your .Xdefaults file:
-
-stjerm.key: f12
-
-stjerm.opacity: 60
-
-stjerm.foreground: #66ff11
-.SH "REPORTING BUGS"
-Report bugs to <[e-mail]>.
-.SH COPYRIGHT
-Copyright \(co 2007-2011 Kristopher Wilson, Stjepan Glavina and Markus Gross
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

=== modified file 'ChangeLog'
--- ChangeLog	2011-10-15 21:47:28 +0000
+++ ChangeLog	2012-11-13 01:30:26 +0000
@@ -1,3 +1,14 @@
+15 Jul 2012 Kristopher Wilson <[e-mail]>
+correcting INSTALL to be more accurate
+fixing issue with keyboard shortcut copy + paste
+
+08 Jul 2012 Kristopher Wilson <[e-mail]>
+fixing unescaped dashes in manpage (barygin)
+added cursorBlink, cursorColor and cursorShape options
+
+22 Dec 2011 Kristopher Wilson <[e-mail]>
+new tab launches when closing the last tab
+
 19 Jul 2010 Kristopher Wilson <[e-mail]>
 released version 0.15
 

=== modified file 'INSTALL'
--- INSTALL	2008-07-06 22:48:49 +0000
+++ INSTALL	2012-11-13 01:30:26 +0000
@@ -1,234 +1,20 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
+The source code comes with a script autogen.sh that will handle running
+autoconf and automake. Run this command and react appropriately to any
+errors:
+
+   ./autogen.sh
+
+Assuming that was successful, you can then continue to:
+
+   ./configure
+   make
+   make install
+
+To install stjerm to a specific location or your own choosing:
+
+   ./configure --prefix=/usr/local
+   make
+   make install

=== modified file 'configure.ac'
--- configure.ac	2011-10-15 21:47:28 +0000
+++ configure.ac	2012-11-13 01:30:26 +0000
@@ -3,7 +3,7 @@
 # (see: sarine.nl/gmpc)
 AC_INIT(src)
 AC_PREREQ(2.59)
-AM_INIT_AUTOMAKE([stjerm], [0.15], [e-mail])
+AM_INIT_AUTOMAKE([stjerm], [0.16], [e-mail])
 #AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
 AC_CONFIG_SRCDIR([src/mainwindow.c])
 AC_CONFIG_HEADER([config.h])

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-15 21:47:28 +0000
+++ debian/changelog	2012-11-13 01:30:26 +0000
@@ -1,3 +1,11 @@
+stjerm (0.16-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+  * Drop debian/patches/man-hyphen.patch (fixed upstream).
+  * Bump Standards-Version to 3.9.3.
+
+ -- Logan Rosen <[e-mail]>  Sat, 03 Nov 2012 16:30:44 -0400
+
 stjerm (0.15-0ubuntu1) precise; urgency=low
 
   * New upstream release (LP: #553958).

=== modified file 'debian/control'
--- debian/control	2011-10-15 21:47:28 +0000
+++ debian/control	2012-11-13 01:30:26 +0000
@@ -5,7 +5,7 @@
 XSBC-Original-Maintainer: Carol Meertens <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, pkg-config,
  libgtk2.0-dev (>= 2.10), libglib2.0-dev (>= 2.10), libvte-dev (>= 0.20)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://code.google.com/p/stjerm-terminal/
 
 Package: stjerm

=== removed directory 'debian/patches'
=== removed file 'debian/patches/man-hyphen.patch'
--- debian/patches/man-hyphen.patch	2011-10-15 21:47:28 +0000
+++ debian/patches/man-hyphen.patch	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Description: Properly escape hyphens in manual page.
-Author: Ilya Barygin <[e-mail]>
---- stjerm-0.15.orig/doc/stjerm.8
-+++ stjerm-0.15/doc/stjerm.8
-@@ -118,7 +118,7 @@ Allows the tabs of the tab bar to be reo
- .SH EXAMPLES
- To run stjerm with F12 as shortcut key, the opacity of 60 and a green foreground color, use:
- 
--stjerm -k f12 -o 60 -fg 66ff11
-+stjerm \-k f12 \-o 60 \-fg 66ff11
- 
- 
- To specify the same options in the .Xdefaults file, write this in your .Xdefaults file:

=== removed file 'debian/patches/series'
--- debian/patches/series	2011-10-15 21:47:28 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-man-hyphen.patch

=== modified file 'doc/stjerm.8'
--- doc/stjerm.8	2011-10-15 21:47:28 +0000
+++ doc/stjerm.8	2012-11-13 01:30:26 +0000
@@ -1,4 +1,4 @@
-.TH STJERM "8" "Last Change: 19 Jul 2011" "stjerm 0.15" ""
+.TH STJERM "8" "Last Change: 7 Jul 2012" "stjerm 0.16" ""
 .SH NAME
 stjerm \- quake\-style terminal emulator
 .SH SYNOPSIS
@@ -115,6 +115,15 @@
 .TP
 .B "allowreorder, \-ar"
 Allows the tabs of the tab bar to be reordered.
+.TP
+.B "cursorBlink, \-ub"
+Should the cursor blink? Default: true.
+.TP
+.B "cursorColor, \-uc"
+The color of the cursor. Default: white
+.TP
+.B "cursorShape, \-us"
+Cursor shape, one of [block,ibeam,underline]. Default: block
 .SH EXAMPLES
 To run stjerm with F12 as shortcut key, the opacity of 60 and a green foreground color, use:
 

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-10-15 21:47:28 +0000
+++ src/Makefile.am	2012-11-13 01:30:26 +0000
@@ -1,8 +1,9 @@
-STJERM_VERSION = 0.15
+STJERM_VERSION = 0.16
 
 bin_PROGRAMS = stjerm
 
-stjerm_SOURCES = main.c mainwindow.c config.c term.c popupmenu.c shortcut.c
+stjerm_SOURCES = main.c mainwindow.c config.c term.c \
+	popupmenu.c shortcut.c
 
 INCLUDES= -Wall\
           -DSTJERM_VERSION=\"$(STJERM_VERSION)\"

=== modified file 'src/config.c'
--- src/config.c	2011-10-15 21:47:28 +0000
+++ src/config.c	2012-11-13 01:30:26 +0000
@@ -69,6 +69,9 @@
 static char _bgimage[200];
 static gboolean _scrolloutput;
 static gboolean _allowreorder;
+static gboolean _cursor_blink;
+static VteTerminalCursorShape _cursor_shape;
+static GdkColor _cursor_color;
 
 static void set_border(char*);
 static void set_mod(char*);
@@ -110,6 +113,9 @@
 char* conf_get_bg_image(void);
 gboolean conf_get_scroll_on_output(void);
 gboolean conf_get_allow_reorder(void);
+gboolean conf_get_cursor_blink(void);
+GdkColor conf_get_cursor_color(void);
+VteTerminalCursorShape conf_get_cursor_shape(void);
 
 Option options[OPTION_COUNT] = {
     {"key", "-k", "KEY", "Shortcut key (eg: f12)."},
@@ -138,7 +144,10 @@
     {"fixedx", "-fx", "NUMBER", "Overrides any calculated horizontal position."},
     {"fixedy", "-fy", "NUMBER", "Overrides any calculated vertical position."},
     {"allowreorder", "-ar", "BOOLEAN", "Allow reordering of terminal tabs."},
-    {"colorX", "-cX", "COLOR", "Specify color X of the terminals color palette"}
+    {"colorX", "-cX", "COLOR", "Specify color X of the terminals color palette"},
+    {"cursorBlink", "-ub", "BOOLEAN", "Should the cursor blink? Default: true"},
+    {"cursorColor", "-uc", "COLOR", "The color of the cursor. Default: white"},
+    {"cursorShape", "-us", "STRING", "Cursor shape, one of [block,ibeam,underline]. Default: block"}
 };
 
 pid_t get_stjerm_pid(void)
@@ -202,7 +211,7 @@
     else if(!strcmp(v, "win"))
         _mod = Mod4Mask;
     else
-        _mod = 0;
+        _mod = ControlMask;
 }
 
 void set_key(char *v)
@@ -326,6 +335,9 @@
     _fixedx = -1;
     _fixedy = -1;
     _allowreorder = TRUE;
+    _cursor_blink = TRUE;
+    gdk_color_parse("white", &_cursor_color);
+    _cursor_shape = VTE_CURSOR_SHAPE_BLOCK;
 }
 
 void read_value(char *name, char *value)
@@ -431,6 +443,21 @@
             _scrolloutput = parse_bool_str(value, _scrolloutput);
         else if(!strcmp("allowreorder", name) || !strcmp("-ar", name))
             _allowreorder = parse_bool_str(value, _allowreorder);
+        else if(!strcmp("cursorBlink", name) || !strcmp("-ub", name))
+            _cursor_blink = parse_bool_str(value, _cursor_blink);
+        else if(!strcmp("cursorColor", name) || !strcmp("-uc", name)) {
+            if(!parse_hex_color(value, &_cursor_color))
+                gdk_color_parse("white", &_cursor_color);
+        }
+        else if (!strcmp("cursorShape", name) || !strcmp("-us", name)) {
+            if (!strcmp("block", name)) {
+                _cursor_shape = VTE_CURSOR_SHAPE_BLOCK;
+            } else if (!strcmp("ibeam", name)) {
+                _cursor_shape = VTE_CURSOR_SHAPE_IBEAM;
+            } else if (!strcmp("underline", name)) {
+                _cursor_shape = VTE_CURSOR_SHAPE_UNDERLINE;
+            }
+        }
     }
 }
 
@@ -811,3 +838,17 @@
     return _allowreorder;
 }
 
+gboolean conf_get_cursor_blink(void)
+{
+    return _cursor_blink;
+}
+
+VteTerminalCursorShape conf_get_cursor_shape(void)
+{
+    return _cursor_shape;
+}
+
+GdkColor conf_get_cursor_color(void)
+{
+    return _cursor_color;
+}

=== modified file 'src/mainwindow.c'
--- src/mainwindow.c	2011-10-15 21:47:28 +0000
+++ src/mainwindow.c	2012-11-13 01:30:26 +0000
@@ -73,8 +73,8 @@
 static void mainwindow_prev_tab(GtkWidget *widget, gpointer user_data);
 static void mainwindow_new_tab(GtkWidget *widget, gpointer user_data);
 static void mainwindow_delete_tab(GtkWidget *widget, gpointer user_data);
-static void mainwindow_copy(GtkWidget *widget, gpointer user_data);
-static void mainwindow_paste(GtkWidget *widget, gpointer user_data);
+static gint mainwindow_copy(GtkWidget *widget, gpointer user_data);
+static gint mainwindow_paste(GtkWidget *widget, gpointer user_data);
 
 static gint mainwindow_tab_at_xy(GtkNotebook *notebook, gint abs_x, gint abs_y);
 static void mainwindow_notebook_clicked(GtkWidget *widget, GdkEventButton *event, gpointer func_data);
@@ -402,19 +402,17 @@
         }
     }
 
-    if(tabcount > 1)
-    {
-        g_array_remove_index(tabs, thetab);
-        tabcount--;
-        
-        gtk_notebook_remove_page(tabbar, thetab);
-        activetab = gtk_notebook_get_current_page(tabbar);
+    g_array_remove_index(tabs, thetab);
+    tabcount--;
+    
+    gtk_notebook_remove_page(tabbar, thetab);
+    activetab = gtk_notebook_get_current_page(tabbar);
 
-        if(tabcount == 1 && conf_get_show_tab() == TABS_ONE)
-            gtk_notebook_set_show_tabs(tabbar, FALSE);
-    } 
-    else
-        gtk_widget_destroy(GTK_WIDGET(mainwindow));
+    if(tabcount == 1 && conf_get_show_tab() == TABS_ONE)
+        gtk_notebook_set_show_tabs(tabbar, FALSE);
+    
+    if (tabcount == 0)
+        mainwindow_create_tab();
     
     if(tabcount == 1)
         gtk_widget_set_sensitive(GTK_WIDGET(close_tab), FALSE);
@@ -631,15 +629,29 @@
             GTK_WIDGET(g_array_index(tabs, VteTerminal*, activetab)));
 }
 
-static void mainwindow_copy(GtkWidget *widget, gpointer user_data)
+static gint mainwindow_copy(GtkWidget *widget, gpointer user_data)
 {
     vte_terminal_copy_clipboard
         (g_array_index(tabs, VteTerminal*, activetab));
+
+    return TRUE;
 }
 
-static void mainwindow_paste(GtkWidget *widget, gpointer user_data) 
+static gint mainwindow_paste(GtkWidget *widget, gpointer user_data) 
 {
     vte_terminal_paste_clipboard
         (g_array_index(tabs, VteTerminal*, activetab));
-}
-
+
+    return TRUE;
+}
+
+
+
+
+
+
+
+static void mainwindow_set_terminal_opacity(int value)
+{
+    
+}

=== modified file 'src/popupmenu.c'
--- src/popupmenu.c	2011-10-15 21:47:28 +0000
+++ src/popupmenu.c	2012-11-13 01:30:26 +0000
@@ -2,7 +2,7 @@
  * popupmenu.c
  * This file is part of Stjerm
  *
- * Copyright (C) 2007-2010 - Kristopher Wilson, Stjepan Glavina and Markus Groß
+ * Copyright (C) 2007-2012 - Kristopher Wilson, Stjepan Glavina and Markus Groß
  * 
  * Stjerm is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -119,4 +119,3 @@
 {
     popupmenu_shown = FALSE;
 }
-

=== modified file 'src/stjerm.h'
--- src/stjerm.h	2011-10-15 21:47:28 +0000
+++ src/stjerm.h	2012-11-13 01:30:26 +0000
@@ -24,6 +24,7 @@
 #define __STJERM_H__
 
 #include <gtk/gtk.h>
+#include <vte/vte.h>
 #include <X11/Xlib.h>
 
 #define TERM_ICONIFY_WINDOW    0
@@ -53,7 +54,7 @@
 #define TABS_ONE    1
 #define TABS_ALWAYS 2
 
-#define OPTION_COUNT 27
+#define OPTION_COUNT 30
 
 
 // The following defines borrowed from gnome-terminal:
@@ -122,6 +123,8 @@
 extern void grab_key(void);
 extern void wait_key(void);
 
+extern void buildprefswindow(void);
+
 extern void conf_init(void);
 extern char* conf_get_font(void);
 extern float conf_get_opacity(void);
@@ -148,6 +151,10 @@
 extern char* conf_get_bg_image(void);
 extern gboolean conf_get_allow_reorder(void);
 extern gboolean conf_get_scroll_on_output();
+extern gboolean conf_get_cursor_blink(void);
+extern GdkColor conf_get_cursor_color(void);
+extern VteTerminalCursorShape conf_get_cursor_shape(void);
+
 
 #endif /* __STJERM_H__ */
 

=== modified file 'src/term.c'
--- src/term.c	2011-10-15 21:47:28 +0000
+++ src/term.c	2012-11-13 01:30:26 +0000
@@ -75,6 +75,14 @@
     vte_terminal_set_word_chars(VTE_TERMINAL(term),
         "-A-Za-z0-9_$.+!*(),;:@&=?/~#%");
 
+    GdkColor cursor = conf_get_cursor_color();
+
+    vte_terminal_set_cursor_blink_mode(VTE_TERMINAL(term), conf_get_cursor_blink() ?
+        VTE_CURSOR_BLINK_ON : VTE_CURSOR_BLINK_OFF);
+    vte_terminal_set_cursor_shape(VTE_TERMINAL(term), conf_get_cursor_shape());
+    vte_terminal_set_color_cursor(VTE_TERMINAL(term), &cursor);
+    
+
     term_connect_signals(term);
 
     return term;