vt: add ioctl commands to /dev/vcsaX to get/put the current palette of the given tty
Subsystems (3)
PATCH 1/1 vt: add ioctl commands to /dev/vcsaX to get/put the current palette of the given tty
From: Cedric Roux <[email protected]>
Adding a ioctl interface and two ioctl commands to /dev/vcsaX to get/put the current palette of the given tty.
---
This patch exists because there is no way to get the current installed palette of a given tty. The PIO_CMAP and GIO_CMAP in vt_ioctl.c:vt_ioctl play with the global default colormap. And /dev/vcsaX don't dump the palette through their read interface. And since a user may change colors of a given tty by escape sequences, one should be able to retrieve the palette through /dev/vcsaX, leading to this patch.
Some points I am not fully confident with:
- I am not sure about the return values in case of error.
- vt.c:set_colormap is now used in vc_screen.c so cannot be static anymore.
The goal of this patch is to allow read access to the palette, I can remove the PIO_CMAP case and make set_colormap static again. This case is there because /dev/vcsaX is read/write so the access to the palette should also be read/write. (Or I can do it differently, no problem, just tell me how.)
(In case of formatting problem of this mail, I apologize. I have a very bad mail access... Just tell me and I'll do my best to resend something clean.)
drivers/char/vc_screen.c +55 -0
@@ -19,6 +19,8 @@* [email protected] - modified not to send characters to wrong console * - fixed some fatal off-by-one bugs (0-- no longer == -1 -> looping and looping and looping...) * - making it shorter - scr_readw are macros which expand in PRETTY long code +* +* Colormap put/get for /dev/vcsaX, Cedric Roux <[email protected]>, March 2009. */ #include <linux/kernel.h>
@@ -470,11 +472,64 @@ vcs_open(struct inode *inode, struct filreturn ret; } +static int +vcs_ioctl (struct inode *inode,struct file *file,unsigned int cmd, +unsigned long arg) +{ +unsigned int currcons =iminor (inode); +struct vc_data *vc; +unsigned char pal[16 *3 ]; +int ret =0 ; + +/* access only defined for /dev/vcsaX, not /dev/vcsX */ +if (currcons <128 ) +return -ENOIOCTLCMD ; + +acquire_console_sem (); + + currcons &=127 ; +if (currcons ==0 ) + currcons = fg_console; +else + currcons--; +if (!vc_cons_allocated (currcons)) { + ret = -ENXIO ; + goto unlock_out; + } + vc = vc_cons[currcons].d; + +switch (cmd) { +case PIO_CMAP : +if (copy_from_user (pal, (void __user *)arg,16 *3 )) { + ret = -EFAULT ; + goto unlock_out; + } +memcpy (vc->vc_palette, pal,16 *3 ); +set_palette (vc); +break ; +case GIO_CMAP : +if (copy_to_user ((void __user *)arg, vc->vc_palette,16 *3 )) { + ret = -EFAULT ; + goto unlock_out; + } +break ; +default : + ret = -ENOIOCTLCMD ; +break ; + } + +unlock_out: +release_console_sem (); + +return ret; +} +static const struct file_operations vcs_fops = { .llseek = vcs_lseek, .read = vcs_read, .write = vcs_write, .open = vcs_open, + .ioctl = vcs_ioctl, };static struct class *vc_class;
drivers/char/vt.c +1 -2
@@ -156,7 +156,6 @@ static void set_cursor(struct vc_data *vstatic void hide_cursor (struct vc_data *vc);static void console_callback (struct work_struct *ignored);static void blank_screen_t (unsigned long dummy); -static void set_palette (struct vc_data *vc);static int printable;/* Is console ready for printing? */ int default_utf8 = true;
@@ -3756,7 +3755,7 @@ void poke_blanked_console(void)* Palettes */ -static void set_palette (struct vc_data *vc) +void set_palette (struct vc_data *vc) {WARN_CONSOLE_UNLOCKED ();
include/linux/vt_kern.h +1 -0
@@ -97,6 +97,7 @@ void reset_vc(struct vc_data *vc);extern int unbind_con_driver (const struct consw *csw,int first,int last,int deflt);int vty_init (const struct file_operations *console_fops); +void set_palette (struct vc_data *vc);/* * vc_screen.c shares this temporary buffer with the console write code so that
Quoted 5 lines · On Sun, 1 Mar 2009 19:40:26 +0100 (CET) Cedric Roux…
From: Cedric Roux <[email protected]>
Adding a ioctl interface and two ioctl commands to
/dev/vcsaXto get/put the current palette of the given tty.
Please also cc linux-api on API-affecting changes.
Quoted 11 lines
---
This patch exists because there is no way to get the current installed palette of a given tty. ThePIO_CMAPandGIO_CMAPin vt_ioctl.c:vt_ioctl play with the global default colormap. And/dev/vcsaXdon't dump the palette through their read interface. And since a user may change colors of a given tty by escape sequences, one should be able to retrieve the palette through/dev/vcsaX, leading to this patch.Some points I am not fully confident with:
- I am not sure about the return values in case of error.
Me either.
Quoted 30 lines
- vt.c:set_colormap is now used in
vc_screen.cso cannot be static anymore.
The goal of this patch is to allow read access to the palette, I can remove thePIO_CMAPcase and makeset_colormapstatic again. This case is there because/dev/vcsaXis read/write so the access to the palette should also be read/write. (Or I can do it differently, no problem, just tell me how.)(In case of formatting problem of this mail, I apologize. I have a very bad mail access... Just tell me and I'll do my best to resend something clean.)
diff -uprN -X linux-2.6.28/Documentation/dontdiff
linux-2.6.28-vanilla/drivers/char/vc_screen.clinux-2.6.28/drivers/char/vc_screen.cdrivers/char/vc_screen.c +4
-0@@ -19,6 +19,8 @@* [email protected] - modified not to send characters to wrong console * - fixed some fatal off-by-one bugs (0-- no longer == -1 -> looping and looping and looping...) * - making it shorter - scr_readw are macros which expand in PRETTY long code +* +* Colormap put/get for /dev/vcsaX, Cedric Roux <[email protected]>, March 2009. */ #include <linux/kernel.h> @@ -470,11 +472,64 @@ vcs_open(struct inode *inode, struct filreturn ret; } +static int +vcs_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
drivers/char/vc_screen.c vcs_open(struct inode *inode, struct fil · line 486
Quoted 10 lines
drivers/char/vc_screen.c +10
-0+ unsigned long arg) +{ +unsigned int currcons =iminor (inode); +struct vc_data *vc; +unsigned char pal[16 *3 ]; +int ret =0 ; + +/* access only defined for /dev/vcsaX, not /dev/vcsX */ +if (currcons <128 ) +return -ENOIOCTLCMD ;
What's going on with vfs_ioctl():
if (filp->f_op->unlocked_ioctl) {
error = filp->f_op->unlocked_ioctl(filp, cmd, arg);
if (error == -ENOIOCTLCMD)
error = -EINVAL;
goto out;
} else if (filp->f_op->ioctl) {
lock_kernel();
error = filp->f_op->ioctl(filp->f_path.dentry->d_inode,
filp, cmd, arg);
unlock_kernel();
}So if ->unlocked_ioctl exists we'll convert ENOIOCTLCMD into EINVAL. Isn't that supposed to be ENOTTY? The comment thinks so:
* Invokes filesystem specific ->unlocked_ioctl, if one exists; otherwise
* invokes filesystem specific ->ioctl method. If neither method exists,
* returns -ENOTTY.
If ->unlocked_ioctl doesn't exist, we'll return ENOIOCTLCMD back to userspace, I think. That would be wrong.
Quoted 36 lines
drivers/char/vc_screen.c +36
-0+acquire_console_sem (); + + currcons &=127 ; +if (currcons ==0 ) + currcons = fg_console; +else + currcons--; +if (!vc_cons_allocated (currcons)) { + ret = -ENXIO ; + goto unlock_out; + } + vc = vc_cons[currcons].d; + +switch (cmd) { +case PIO_CMAP : +if (copy_from_user (pal, (void __user *)arg,16 *3 )) { + ret = -EFAULT ; + goto unlock_out; + } +memcpy (vc->vc_palette, pal,16 *3 ); +set_palette (vc); +break ; +case GIO_CMAP : +if (copy_to_user ((void __user *)arg, vc->vc_palette,16 *3 )) { + ret = -EFAULT ; + goto unlock_out; + } +break ; +default : + ret = -ENOIOCTLCMD ; +break ; + } + +unlock_out: +release_console_sem (); +
drivers/char/vc_screen.c vcs_open(struct inode *inode, struct fil · line 533
Quoted 10 lines
drivers/char/vc_screen.c +4
-0+return ret; +} +static const struct file_operations vcs_fops = { .llseek = vcs_lseek, .read = vcs_read, .write = vcs_write, .open = vcs_open, + .ioctl = vcs_ioctl, };
.ioctl is old and deprecated. Please use .unlocked_ioctl
--
To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html